费用计算

performance-api/src/main/java/com/clx/performance/vo/pc/CarrierOrderChildDetailVO.java

@@ -76,9 +76,6 @@ public class CarrierOrderChildDetailVO {
     @ApiModelProperty(value = "卸货净重（单位吨）", example = "1.23")
     private BigDecimal unloadNet;
 
-    @ApiModelProperty(value = "运费（元）", example = "1.23")
-    @MoneyOutConvert
-    private BigDecimal freight;
 
     @ApiModelProperty(value = "取消原因", example = "抢错了")
     private String cancelRemark;

performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java

@@ -1114,14 +1114,14 @@ public class OrderChildServiceImpl implements OrderChildService {
         //应付运费
         BigDecimal payableFreight=BigDecimal.ZERO;
         if(Objects.nonNull(orderChild.getLoadNet())){
-            payableFreight = orderChild.getLoadNet().multiply(carrierOrderChildDetailVO.getFreight());
+            payableFreight = orderChild.getLoadNet().multiply(carrierOrderChildDetailVO.getFreightPrice());
         }
 
         //亏吨扣款（元）
         BigDecimal lossDeduction=BigDecimal.ZERO;
         if(Objects.nonNull(orderChild.getLoadNet()) && Objects.nonNull(orderChild.getUnloadNet())){
             if(orderChild.getLoadNet().compareTo(orderChild.getUnloadNet()) >0){
-                lossDeduction = carrierOrderChildDetailVO.getFreight().multiply(orderChild.getLoadNet().subtract(orderChild.getUnloadNet()));
+                lossDeduction = carrierOrderChildDetailVO.getLossPrice().multiply(orderChild.getLoadNet().subtract(orderChild.getUnloadNet()));
             }
         }