Merge branch 'v6.4_transportation_20231110' into test

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

@@ -425,8 +425,7 @@ public class BreakContractSettlementOwnerServiceImpl  implements BreakContractSe
         BreakContractOwnerRuleVO.AutoRule autoRule = JSONObject.parseObject(autoRuleJson, BreakContractOwnerRuleVO.AutoRule.class);
         BreakContractOwnerRuleVO.OrderCancelRule orderCancelRule = autoRule.getOrderCancelRule();//订单取消规则
 
-        //运单状态（包括货主取消）
-        //运单状态（包括货主取消）
+        //运单状态
         List<Integer> statusList = new ArrayList<>();
         statusList.add(OrderChildEnum.Status.CREATED.getCode());
         statusList.add(OrderChildEnum.Status.PAY.getCode());
@@ -485,8 +484,13 @@ public class BreakContractSettlementOwnerServiceImpl  implements BreakContractSe
                 BigDecimal noTransitWeight = transportWeight.subtract(deliveredWeight);//未拉运的重量
                 BigDecimal noTransitFreight = noTransitWeight.multiply(validFreightPrice);//未拉运的费用
                 BigDecimal totalFreight = deliveredFreight.add(noTransitFreight);//总运费
-                BigDecimal baseFigure = totalFreight.multiply(orderCancelRule.getAfterRatio()).multiply(cancelWeight)
-                        .divide(transportWeight,2, BigDecimal.ROUND_HALF_UP);//基础违约金
+                BigDecimal baseFigure;
+                if(cancelWeight.compareTo(BigDecimal.ZERO) == 0){//没有取消的吨数
+                    baseFigure = totalFreight.multiply(orderCancelRule.getAfterRatio());//基础违约金
+                }else{
+                    baseFigure = totalFreight.multiply(orderCancelRule.getAfterRatio()).multiply(cancelWeight)
+                            .divide(transportWeight,2, BigDecimal.ROUND_HALF_UP);//基础违约金
+                }
 
                 //挂单后，车辆违约金
                 BigDecimal truckFigure = BigDecimal.ZERO;