运单积分

performance-web/src/main/java/com/clx/performance/dao/OrderChildDao.java

@@ -74,6 +74,7 @@ public interface OrderChildDao extends BaseDao<OrderChildMapper, OrderChild, Int
     int countCompleteByTruckNoAndPayFinishTime(@Param("truckNo") String truckNo,
                                                @Param("beginTime")String beginTime,
                                                @Param("endTime")String endTime,
+                                               @Param("confirmTime")String confirmTime,
                                                @Param("list")List<String> orderGoodsNoList
     );
 }

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

@@ -246,11 +246,12 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
     }
 
     @Override
-    public int countCompleteByTruckNoAndPayFinishTime(String truckNo, String beginTime, String endTime, List<String> orderGoodsNoList) {
+    public int countCompleteByTruckNoAndPayFinishTime(String truckNo, String beginTime, String endTime, String confirmTime, List<String> orderGoodsNoList) {
         return (int)count(lQrWrapper()
                 .eq(OrderChild::getTruckNo, truckNo)
                 .ge(OrderChild::getPayTime, beginTime)
-                .le(OrderChild::getPayTime, endTime)
+                .lt(OrderChild::getPayTime, endTime)
+                .le(OrderChild::getConfirmTime, confirmTime)
                 .ge(OrderChild::getStatus, OrderChildEnum.Status.UNSETTLE.getCode())
                 .le(OrderChild::getStatus, OrderChildEnum.Status.COMPLETE.getCode())
                 .in(OrderChild::getOrderGoodsNo, orderGoodsNoList)

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

@@ -372,7 +372,11 @@ public class IntegralMqHandlerServiceImpl implements IntegralMqHandlerService {
         int completeNumIntegral = 0;
         String completeNumIntegralRemark="";
         List<String> enableOrderNoList = integralOrderDao.getAllOrderNoList();
-        int finishNum = orderChildDao.countCompleteByTruckNoAndPayFinishTime(orderChild.getTruckNo(), LocalDateTimeUtils.formatTime(dateTimeDayStart), LocalDateTimeUtils.formatTime(dateTimeDayNext), enableOrderNoList);
+        int finishNum = orderChildDao.countCompleteByTruckNoAndPayFinishTime(orderChild.getTruckNo(),
+                LocalDateTimeUtils.formatTime(dateTimeDayStart),
+                LocalDateTimeUtils.formatTime(dateTimeDayNext),
+                LocalDateTimeUtils.formatTime(orderChild.getConfirmTime()),
+                enableOrderNoList);
         log.info("司机积分，车辆完成量，truckNo:{}, sum:{}", orderChild.getChildNo(), finishNum);
 
         if (finishNum == 1){