Merge remote-tracking branch 'origin/v5.3_driver_integral_20231009' into…

performance-web/src/main/java/com/clx/performance/mapper/IntegralOrderMapper.java

@@ -37,7 +37,7 @@ public interface IntegralOrderMapper extends BaseMapper<IntegralOrder> {
     @SelectProvider(type = IntegralOrderSqlProvider.class, method = "pageByParam")
     IPage<IntegralOrderVO> pageByParam(@Param("page") Page<IntegralOrderVO> page, @Param("param") pageIntegralOrderParam param);
 
-    @Select("select order_no from integral_order ")
+    @Select("select order_goods_no from integral_order ")
     List<String> getAllOrderNoList();
 
 }
\ No newline at end of file

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

@@ -300,7 +300,7 @@ public class IntegralMqHandlerServiceImpl implements IntegralMqHandlerService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void orderChildFinish(IntegralOrderChildFinishMqParam mq) {
-        String statisticsDate = LocalDateTimeUtils.getStringDayStart();
+        String statisticsDate = LocalDateTimeUtils.getWeekStart();
 
         OrderChild orderChild = orderChildDao.getByChildNo(mq.getChildNo()).orNull();
         if (null == orderChild) {return;}

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

@@ -918,12 +918,13 @@ public class OrderChildServiceImpl implements OrderChildService {
 
         String childNo = orderChild.getChildNo();
 
-        orderChild.setStatus(OrderChildEnum.Status.UNSETTLE.getCode());
+        // 结算完成
+        orderChild.setStatus(OrderChildEnum.Status.COMPLETE.getCode());
         orderChildDao.updateDriverConfirm(orderChild);
 
         // 日志
-        orderChildLogService.saveDriverOrderChildLog(childNo, OrderChildLogEnum.Type.DRIVER_CONFIRM.getCode(),
-                OrderChildLogEnum.Type.DRIVER_CONFIRM.getMsg(), loginUserInfo.getUserNo(), loginUserInfo.getUserName());
+        orderChildLogService.saveDriverOrderChildLog(childNo, OrderChildLogEnum.Type.SETTLEMENT.getCode(),
+                OrderChildLogEnum.Type.SETTLEMENT.getMsg(), loginUserInfo.getUserNo(), loginUserInfo.getUserName());
 
         // 运单结束
         orderChildFinish(orderChild);