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

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

@@ -465,9 +465,9 @@ public class OrderChildServiceImpl implements OrderChildService {
             throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_STATUS_CHANGED);
         }
         // 装货超时
-        if (orderChild.getLoadDeadline().isBefore(LocalDateTime.now())) {
-            throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_LOAD_TIMEOUT);
-        }
+//        if (orderChild.getLoadDeadline().isBefore(LocalDateTime.now())) {
+//            throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_LOAD_TIMEOUT);
+//        }
 
         // 距离验证
         FeignOrderInfoVO orderInfo = orderService.getOrderInfo(orderChild.getOrderNo()).orElseThrow(

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

@@ -246,7 +246,7 @@ public class BreakContractDriverRecordServiceImpl  implements BreakContractDrive
      * 费用计算 （运单取消）
      */
     private BigDecimal orderChildCancelFigureCalc(OrderChild orderChild, BreakContractDriverRuleVO rule){
-        long time = com.clx.performance.utils.LocalDateTimeUtils.betweenSecond(orderChild.getCancelTime(), orderChild.getPayTime());
+        long time = com.clx.performance.utils.LocalDateTimeUtils.betweenSecond(orderChild.getPayTime(), orderChild.getCancelTime());
         long baseTime = rule.getDriverCancelRule().getBaseTime().multiply(BigDecimal.valueOf(3600)).setScale(0, RoundingMode.HALF_UP).longValue();
 
         if (time < baseTime) {
@@ -254,7 +254,7 @@ public class BreakContractDriverRecordServiceImpl  implements BreakContractDrive
         }
         else {
             BigDecimal money = rule.getDriverCancelRule().getBaseFigure();
-            money = money.add(BigDecimal.valueOf(time-baseTime).divide(BigDecimal.valueOf(1800), 0, RoundingMode.UP).multiply(rule.getDriverCancelRule().getBaseFigure()));
+            money = money.add(BigDecimal.valueOf(time-baseTime).divide(BigDecimal.valueOf(1800), 0, RoundingMode.UP).multiply(rule.getDriverCancelRule().getFigurePerHour()));
             return money.movePointRight(2);
         }
     }
@@ -263,7 +263,7 @@ public class BreakContractDriverRecordServiceImpl  implements BreakContractDrive
      * 费用计算 （到达货源地超时）
      */
     private BigDecimal arriveSendAddressFigureCalc(OrderChild orderChild, OrderGoods orderGoods, BreakContractDriverRuleVO rule){
-        long time = com.clx.performance.utils.LocalDateTimeUtils.betweenSecond(orderChild.getArriveSendTime(), orderGoods.getLastArriveSendTime());
+        long time = com.clx.performance.utils.LocalDateTimeUtils.betweenSecond(orderGoods.getLastArriveSendTime(), orderChild.getArriveSendTime());
 
         BigDecimal money = BigDecimal.valueOf(time).divide(BigDecimal.valueOf(3600), 0, RoundingMode.HALF_UP).multiply(rule.getSendAddressRule().getFigurePerHour());
         return money.movePointRight(2);
@@ -273,7 +273,7 @@ public class BreakContractDriverRecordServiceImpl  implements BreakContractDrive
      * 费用计算 (到达目的地超时)
      */
     private BigDecimal arriveReceiveAddressFigureCalc(OrderChild orderChild, OrderGoods orderGoods, BreakContractDriverRuleVO rule){
-        long time = com.clx.performance.utils.LocalDateTimeUtils.betweenSecond(orderChild.getArriveReceiveTime(), orderGoods.getLastArriveReceiveTime());
+        long time = com.clx.performance.utils.LocalDateTimeUtils.betweenSecond(orderGoods.getLastArriveReceiveTime(), orderChild.getArriveReceiveTime());
 
         BigDecimal money = BigDecimal.valueOf(time).divide(BigDecimal.valueOf(3600), 0, RoundingMode.UP).multiply(rule.getReceiveAddressRule().getFigurePerHour()).multiply(orderChild.getWeight()).setScale(2, RoundingMode.HALF_UP);
         return money.movePointRight(2);