运单积分统计

performance-web/src/main/java/com/clx/performance/dao/impl/OrderChildDaoImpl.java

@@ -241,7 +241,7 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
                 .eq(OrderChild::getTruckNo, truckNo)
                 .ge(OrderChild::getPayTime, beginTime)
                 .le(OrderChild::getPayTime, endTime)
-                .ge(OrderChild::getStatus, OrderChildEnum.Status.CREATED.getCode())
+                .ge(OrderChild::getStatus, OrderChildEnum.Status.UNSETTLE.getCode())
                 .le(OrderChild::getStatus, OrderChildEnum.Status.COMPLETE.getCode())
                 .in(OrderChild::getOrderNo, orderNoList)
         );

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

@@ -314,7 +314,7 @@ public class IntegralMqHandlerServiceImpl implements IntegralMqHandlerService {
         IntegralTruck truck = integralTruckDao.getByTruckNo(orderChild.getTruckNo()).orNull();
         if (null == truck) {return;}
 
-        List<Integer> finishStatusList = Arrays.asList(OrderChildEnum.Status.COMPLETE.getCode());
+        List<Integer> finishStatusList = Arrays.asList(OrderChildEnum.Status.UNSETTLE.getCode(), OrderChildEnum.Status.COMPLETE.getCode());
         List<Integer> cancelStatusList = OrderChildEnum.CANCEL_lIST;;
 
         int integral = 0;
@@ -373,6 +373,8 @@ public class IntegralMqHandlerServiceImpl implements IntegralMqHandlerService {
         String completeNumIntegralRemark="";
         List<String> enableOrderNoList = integralOrderDao.getAllOrderNoList();
         int finishNum = orderChildDao.countCompleteByTruckNoAndPayFinishTime(orderChild.getTruckNo(), LocalDateTimeUtils.formatTime(dateTimeDayStart), LocalDateTimeUtils.formatTime(dateTimeDayNext), enableOrderNoList);
+        log.info("司机积分，车辆完成量，truckNo:{}, sum:{}", orderChild.getChildNo(), finishNum);
+
         if (finishNum == 1){
             completeNumIntegral = 0;
         }

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

@@ -903,12 +903,13 @@ public class OrderChildServiceImpl implements OrderChildService {
         // 更新车辆状态
         updateDriverOrderStatusDriverConfirm(orderChild.getTruckId());
 
+        // 运单结束
+        orderChildFinish(orderChild);
+
         // 日志
         orderChildLogService.saveDriverOrderChildLog(childNo, OrderChildLogEnum.Type.DRIVER_CONFIRM.getCode(),
                 OrderChildLogEnum.Type.DRIVER_CONFIRM.getMsg(), loginUserInfo.getUserNo(), loginUserInfo.getUserName());
 
-        // 结算
-        updateSettlement(orderChild);
     }
 
     @Override
@@ -974,8 +975,7 @@ public class OrderChildServiceImpl implements OrderChildService {
         }
 
         orderChild.setCancelRemark(param.getRemark());
-        orderChild.setCancelTime(now);
-        orderChild.setFinishTime(now);
+        orderChild.setFinishTime(orderChild.getCancelTime());
         orderChild.setStatus(OrderChildEnum.Status.DRIVER_CANCEL.getCode());
 
         // 返回吨数
@@ -1029,8 +1029,7 @@ public class OrderChildServiceImpl implements OrderChildService {
         }
 
         orderChild.setCancelRemark(param.getRemark());
-        orderChild.setCancelTime(now);
-        orderChild.setFinishTime(now);
+        orderChild.setFinishTime(orderChild.getCancelTime());
         orderChild.setStatus(OrderChildEnum.Status.PLATFORM_CANCEL.getCode());
 
         // 返回吨数