haungfuli 3 роки тому
батько
коміт
ad0fd09310

+ 4 - 5
winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/OrderInfo.java

@@ -136,6 +136,10 @@ public class OrderInfo extends BaseModel<OrderInfo> {
      * 运费
      */
     private Double freight;
+    /**
+     * 实际运费
+     */
+    private Double actualFreight;
     /**
      * 计费方式(0元/吨,1元/车)
      */
@@ -268,11 +272,6 @@ public class OrderInfo extends BaseModel<OrderInfo> {
      */
     @TableField(exist = false)
     private String freightId;
-    /**
-     * 实际运费
-     */
-    @TableField(exist = false)
-    private Double actualFreight;
     /**
      * 司机服务费
      */

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

@@ -120,6 +120,7 @@ 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());