Merge remote-tracking branch 'origin/v5.5_settlement_20231011' into v5.5_settlement_20231011

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

@@ -1198,6 +1198,7 @@ public class OrderChildServiceImpl implements OrderChildService {
     private BigDecimal orderChildFreightCalc(OrderChild orderChild){
         BigDecimal totalFreight = orderChild.getFreightPrice().multiply(orderChild.getWeight());
         if (orderChild.getUnloadNet() != null){
+            totalFreight = orderChild.getFreightPrice().multiply(orderChild.getUnloadNet().compareTo(orderChild.getLoadNet()) < 0? orderChild.getUnloadNet() : orderChild.getLoadNet());
             BigDecimal dif = orderChild.getUnloadNet().subtract(orderChild.getWeight());
             if (dif.compareTo(BigDecimal.ZERO) < 0){
                 totalFreight = totalFreight.add(orderChild.getLossPrice().multiply(dif));