订单表运费问题

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/CarrierInfoServiceImpl.java

@@ -123,7 +123,6 @@ public class CarrierInfoServiceImpl extends ServiceImpl<CarrierInfoMapper, HyCar
                         .eq("id", hyCarrierInfo1.getOrderId())
                         .eq("delete_flag", "0"));
                 if (orderInfo != null) {
-                    orderInfo.setActualFreight(hyCarrierInfo.getTotalFreight());
                     orderInfo.setOrderStatus(StatusEnum.OWNER_CONFIRMED_UNLOAD.getName());
                     orderInfo.setOrderStatusKey(StatusEnum.OWNER_CONFIRMED_UNLOAD.getFlag());
                     orderInfo.setCargoOwnerStatus(StatusEnum.CONFIRMED_UNLOAD.getName());
@@ -218,6 +217,7 @@ public class CarrierInfoServiceImpl extends ServiceImpl<CarrierInfoMapper, HyCar
             } else {
                 if ("1".equals(hyCarrierInfo.getFlag())) {
                     //确认卸车
+                    orderInfo.setActualFreight(hyCarrierInfo.getTotalFreight());
                     orderInfo.setOrderStatus(StatusEnum.DRIVER_CONFIRM_FREIGHT.getName());
                     orderInfo.setOrderStatusKey(StatusEnum.DRIVER_CONFIRM_FREIGHT.getFlag());
                     orderInfo.setCargoOwnerStatus(StatusEnum.DRIVER_NOT_CONFIRM_FREIGHT.getName());

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/OrderInfoServiceImpl.java

@@ -528,6 +528,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
         if (orderInfo1 != null) {
             //货主
             if ("1".equals(orderInfo.getTypeFlag())) {
+                orderInfo1.setActualFreight(orderInfo.getTotalFreight());
                 orderInfo1.setOrderStatus(StatusEnum.DRIVER_CONFIRM_FREIGHT.getName());
                 orderInfo1.setOrderStatusKey(StatusEnum.DRIVER_CONFIRM_FREIGHT.getFlag());
                 orderInfo1.setCargoOwnerStatus(StatusEnum.DRIVER_NOT_CONFIRM_FREIGHT.getName());