Merge branch 'v4.9_create_goods_child_20230918' into test

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

@@ -6,12 +6,10 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.ToString;
-import lombok.extern.slf4j.Slf4j;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 
-@Slf4j
 @Getter
 @Setter
 @ToString
@@ -44,27 +42,25 @@ public class OrderChildFreightInfoVO {
     @ApiModelProperty(value = "运费（元）（实际运费）", example = "1.23")
     @MoneyOutConvert
     private BigDecimal freight;
+    @ApiModelProperty(value = "损耗单价(分)", example = "1.23")
+    @MoneyOutConvert
+    private BigDecimal lossPrice;
 
     @ApiModelProperty(value = "总运费（元）", example = "1.23")
     @MoneyOutConvert
     private BigDecimal totalFreight;
     public BigDecimal getTotalFreight() {
-        return freightPrice.multiply(weight).setScale(2, RoundingMode.HALF_UP);
+        return freightPrice.multiply(weight).setScale(0, RoundingMode.HALF_UP);
     }
 
     @ApiModelProperty(value = "亏吨扣款（元）", example = "1.23")
     @MoneyOutConvert
     private BigDecimal lossFreight;
     public BigDecimal getLossFreight() {
-
-        log.info("----------{}", (loadNet==null || unloadNet==null || unloadNet.compareTo(loadNet)>0)? BigDecimal.ZERO : freightPrice.multiply(loadNet.subtract(unloadNet)).setScale(0, RoundingMode.HALF_UP));
-        log.info("----------{}:{}:{}", freightPrice,loadNet,unloadNet);
-
-        return (loadNet==null || unloadNet==null || unloadNet.compareTo(loadNet)>0)? BigDecimal.ZERO : freightPrice.multiply(loadNet.subtract(unloadNet)).setScale(2, RoundingMode.HALF_UP);
+        return (loadNet==null || unloadNet==null || unloadNet.compareTo(loadNet)>0)? BigDecimal.ZERO : lossPrice.multiply(loadNet.subtract(unloadNet)).setScale(2, RoundingMode.HALF_UP);
     }
 
     @ApiModelProperty(value = "状态", example = "0")
     private Integer status;
 
-
 }
\ No newline at end of file