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

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

@@ -225,9 +225,12 @@ public interface OrderChildDao extends BaseDao<OrderChildMapper, OrderChild, Int
 
     OrderGoodsTodaySumDTO countTodayOrderGoodsSumByUserNo(Long userNo);
 
+    OrderGoodsTodaySumDTO sumOrderChildFreightByDriverUserNo(Long driverUserNo);
+
     Long countNotCancelOrderChild(List<String> cancelOrderGoodsNo);
 
     Long queryNoCancelChildByOrderGoodsNo(String orderGoodsNo, Integer code);
 
     Long queryTruckProcessingOrderChild(String truckNo);
+
 }

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

@@ -737,6 +737,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 countNotCancelOrderChild(List<String> cancelOrderGoodsNo) {
         LambdaQueryWrapper<OrderChild> queryWrapper = new LambdaQueryWrapper<>();

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

@@ -199,7 +199,25 @@ 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);
+
+    /**
+     * 统计司机今日的订单数和运费
+     *
+     * 50、60、70 取装车吨数（load_net）* 运费单价
+     * 80、90、100 取装车吨数（weight）* 运费单价
+     *
+     * @param driverUserNo
+     * @return
+     */
+    @Select("SELECT COUNT(*) AS todayOrderGoodsSum, IFNULL( SUM( freight), 0 ) AS todayEstimateProfit " +
+            "FROM( SELECT COUNT(*) AS todayOrderGoodsSum, IFNULL( CONVERT ( load_net * freight_price, DECIMAL ( 10, 0 )), 0 ) AS freight " +
+            "FROM order_child WHERE driver_user_no = #{driverUserNo} AND STATUS IN ( 50, 60, 70 ) AND create_time >= CURDATE() AND create_time <= CURDATE() + INTERVAL 1 DAY - INTERVAL 1 SECOND " +
+            "UNION ALL " +
+            "SELECT COUNT(*) AS todayOrderGoodsSum, IFNULL( CONVERT ( weight * freight_price, DECIMAL ( 10, 0 )), 0 ) AS freight " +
+            "FROM order_child WHERE driver_user_no = #{driverUserNo} AND STATUS IN ( 80, 90, 100 ) AND create_time >= CURDATE() AND create_time <= CURDATE() + INTERVAL 1 DAY - INTERVAL 1 SECOND ) " +
+            "AS temp")
+    OrderGoodsTodaySumDTO sumOrderChildFreightByDriverUserNo(Long driverUserNo);
 }
\ No newline at end of file

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

@@ -1106,8 +1106,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;
     }
 

performance-api/src/main/java/com/clx/performance/vo/pc/collect/CarrierDriverCollectTransportIntentionRecordVO.java

@@ -36,8 +36,8 @@ public class CarrierDriverCollectTransportIntentionRecordVO {
     private Integer deleteStatus;
 
     @Schema(description="创建时间")
-    private LocalDateTime createTime;
+    private String createTime;
 
     @Schema(description="修改时间")
-    private LocalDateTime modifiedTime;
+    private String modifiedTime;
 }

performance-api/src/main/java/com/clx/performance/vo/pc/collect/CarrierDriverCollectTransportIntentionVO.java

@@ -45,10 +45,10 @@ public class CarrierDriverCollectTransportIntentionVO {
     private Integer status;
 
     @Schema(description="创建时间")
-    private LocalDateTime createTime;
+    private String createTime;
 
     @Schema(description="修改时间")
-    private LocalDateTime modifiedTime;
+    private String modifiedTime;
 
     @Schema(description = "收集司机拉运意向选项")
     private List<CarrierDriverCollectTransportIntentionRecordVO> collectIntentionRecordList;