Merge remote-tracking branch 'origin/v5.7_break_contract_reverse_20231020' into…

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

@@ -465,7 +465,8 @@ public class BreakContractSettlementOwnerServiceImpl  implements BreakContractSe
 
                     if(Objects.equals(orderChild.getStatus(),OrderChildEnum.Status.CREATED.getCode())
                             || Objects.equals(orderChild.getStatus(),OrderChildEnum.Status.PAY.getCode())
-                            || Objects.equals(orderChild.getStatus(),OrderChildEnum.Status.GO_TO_SEND.getCode())) {
+                            || Objects.equals(orderChild.getStatus(),OrderChildEnum.Status.GO_TO_SEND.getCode())
+                            || Objects.equals(orderChild.getStatus(),OrderChildEnum.Status.OWNER_CANCEL.getCode())) {
                         cancelWeight = cancelWeight.add(orderChild.getWeight());
                         seconds = seconds.add(new BigDecimal(LocalDateTimeUtils.getSecondsDiff(orderChild.getPayTime(),now)));
                     }
@@ -477,7 +478,7 @@ public class BreakContractSettlementOwnerServiceImpl  implements BreakContractSe
                 BigDecimal baseFigure = totalFreight.multiply(orderCancelRule.getAfterRatio()).multiply(cancelWeight)
                         .divide(transportWeight,2, BigDecimal.ROUND_HALF_UP);
                 BigDecimal truckFigure = BigDecimal.ZERO;
-                if(Objects.equals(cancelType,CancelOrderEnum.Type.NOT_ARRIVE)){
+                if(Objects.equals(cancelType,CancelOrderEnum.Type.NOT_ARRIVE.getCode())){
                     truckFigure = seconds.multiply(orderCancelRule.getAfterFigurePerHour())
                             .divide(new BigDecimal(3600),2, BigDecimal.ROUND_HALF_UP);
                 }