司机取消

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

@@ -537,7 +537,7 @@ public class IntegralMqHandlerServiceImpl implements IntegralMqHandlerService {
             else if (realTime >= receiveAddressTime*3) {receivdAddressTimeoutIntegral = -5;}
         }
         else if (null != receiveAddressTime && null != orderChild.getArriveSendTime() && null == orderChild.getArriveReceiveTime()){
-            int realTime = diffSecond(orderChild.getArriveSendTime(), orderChild.getCancelTime());
+            int realTime = diffSecond(orderChild.getArriveSendTime(), orderChild.getFinishTime());
             if (realTime >= receiveAddressTime*2 && realTime < receiveAddressTime*3) {receivdAddressTimeoutIntegral = -3;}
             else if (realTime >= receiveAddressTime*3) {receivdAddressTimeoutIntegral = -5;}
         }

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

@@ -1031,6 +1031,7 @@ public class OrderChildServiceImpl implements OrderChildService {
         }
 
         orderChild.setCancelRemark(param.getRemark());
+        orderChild.setCancelTime(LocalDateTime.now());
         orderChild.setFinishTime(orderChild.getCancelTime());
         orderChild.setStatus(OrderChildEnum.Status.PLATFORM_CANCEL.getCode());