运单流程

performance-api/src/main/java/com/clx/performance/vo/app/OrderChildFreightInfoVO.java

@@ -8,6 +8,7 @@ import lombok.Setter;
 import lombok.ToString;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 
 @Getter
 @Setter
@@ -41,11 +42,19 @@ public class OrderChildFreightInfoVO {
     @ApiModelProperty(value = "运费（元）（实际运费）", example = "1.23")
     @MoneyOutConvert
     private BigDecimal freight;
+
     @ApiModelProperty(value = "总运费（元）", example = "1.23")
     @MoneyOutConvert
     private BigDecimal totalFreight;
     public BigDecimal getTotalFreight() {
-        return freight;
+        return freightPrice.multiply(weight).setScale(0, RoundingMode.HALF_UP);
+    }
+
+    @ApiModelProperty(value = "亏吨扣款（元）", example = "1.23")
+    @MoneyOutConvert
+    private BigDecimal lossFreight;
+    public BigDecimal getLossFreight() {
+        return (loadNet==null || unloadNet==null || unloadNet.compareTo(loadNet)>0)? BigDecimal.ZERO : freightPrice.multiply(loadNet.subtract(unloadNet)).setScale(0, RoundingMode.HALF_UP);
     }
 
     @ApiModelProperty(value = "状态", example = "0")

performance-api/src/main/java/com/clx/performance/vo/app/OrderChildVO.java

@@ -10,6 +10,7 @@ import lombok.Setter;
 import lombok.ToString;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.List;
 
 /**
@@ -144,4 +145,11 @@ public class OrderChildVO {
     @ApiModelProperty(value = "发货地址详情")
     private Address receiveAddressInfo;
 
+    @ApiModelProperty(value = "总运费（元）", example = "1.23")
+    @MoneyOutConvert
+    private BigDecimal totalFreight;
+    public BigDecimal getTotalFreight() {
+        return freightPrice.multiply(weight).setScale(0, RoundingMode.HALF_UP);
+    }
+
 }
\ No newline at end of file