Merge remote-tracking branch 'origin/v29.6_ultimate_interaction_20241017' into test_jdk17

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

@@ -201,12 +201,12 @@ public interface OrderChildDao extends BaseDao<OrderChildMapper, OrderChild, Int
 
     List<CancelOrderGoodsWeightDTO> statisticsCancelOrderGoodsWeight(List<String> childNos);
 
-    List<OrderChild> listBeforeUnloadOrderChild(LocalDateTime startTime,LocalDateTime endTime);
-
     List<OrderChild> listBeforeCompleteByOrderNo(String orderNo);
 
     List<OrderChild> listCompleteByOrderNos(List<String> strings);
 
+    List<OrderChild> listBeforeUnloadOrderChild(LocalDateTime startTime,LocalDateTime endTime);
+
     List<OrderChild> listChidNosByStatus(List<Integer> status);
 
     List<OrderGoodsNotCancelChildDTO> countValidByOrderGoodsNoList(List<String> orderGoodsList);
@@ -227,6 +227,7 @@ public interface OrderChildDao extends BaseDao<OrderChildMapper, OrderChild, Int
 
     OrderGoodsTodaySumDTO countTodayOrderGoodsSumByUserNo(Long userNo);
 
+    OrderGoodsTodaySumDTO sumOrderChildFreightByDriverUserNo(Long driverUserNo);
 
     Long queryTruckProcessingOrderChild(String truckNo);
 }

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

@@ -662,7 +662,6 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
         return baseMapper.statisticsCancelOrderGoodsWeight(childNos);
     }
 
-
     @Override
     public List<OrderChild> listBeforeCompleteByOrderNo(String orderNo) {
         return list(lQrWrapper()
@@ -753,6 +752,11 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
         return baseMapper.countTodayOrderGoodsSumByUserNo(userNo);
     }
 
+    @Override
+    public OrderGoodsTodaySumDTO sumOrderChildFreightByDriverUserNo(Long driverUserNo) {
+        return baseMapper.sumOrderChildFreightByDriverUserNo(driverUserNo);
+    }
+
     @Override
     public Long queryTruckProcessingOrderChild(String truckNo) {
         LambdaQueryWrapper<OrderChild> query = new LambdaQueryWrapper<>();

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

@@ -194,7 +194,12 @@ public interface OrderChildMapper extends BaseMapper<OrderChild> {
     int countLoadByOrderGoodsNo(@Param("orderGoodsNo") String orderGoodsNo);
 
     @Select("select count(*) AS todayOrderGoodsSum, IFNULL(SUM(freight),0) AS todayEstimateProfit from order_child " +
-            " where user_no=#{userNo} and status in(10,110) AND create_time >= CURDATE()" +
+            " where user_no=#{userNo} and status in(10,20,30,40,50,60,70,80,90,100,110,111,112,113) AND create_time >= CURDATE()" +
             "  AND create_time <= CURDATE() + INTERVAL 1 DAY - INTERVAL 1 SECOND")
     OrderGoodsTodaySumDTO countTodayOrderGoodsSumByUserNo(Long userNo);
+
+    @Select("select count(*) AS todayOrderGoodsSum, IFNULL(SUM(freight),0) AS todayEstimateProfit from order_child " +
+            " where driver_user_no=#{driverUserNo} and status = 80 AND pound_status IN (0,1) AND create_time >= CURDATE()" +
+            "  AND create_time <= CURDATE() + INTERVAL 1 DAY - INTERVAL 1 SECOND")
+    OrderGoodsTodaySumDTO sumOrderChildFreightByDriverUserNo(Long driverUserNo);
 }
\ No newline at end of file

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

@@ -1112,8 +1112,9 @@ public class OrderGoodsServiceImpl implements OrderGoodsService, InitializingBea
     public OrderGoodsTodaySumVO getTodayOrderGoodsSum() {
         OrderGoodsTodaySumVO vo = new OrderGoodsTodaySumVO();
         OrderGoodsTodaySumDTO dto = orderChildDao.countTodayOrderGoodsSumByUserNo(TokenUtil.getLoginUserInfo().getUserNo());
+        OrderGoodsTodaySumDTO dtoTwo = orderChildDao.sumOrderChildFreightByDriverUserNo(TokenUtil.getLoginUserInfo().getUserNo());
         vo.setTodayOrderGoodsSum(dto.getTodayOrderGoodsSum());
-        vo.setTodayEstimateProfit(dto.getTodayEstimateProfit());
+        vo.setTodayEstimateProfit(dtoTwo.getTodayEstimateProfit());
         return vo;
     }