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

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

@@ -198,8 +198,21 @@ public interface OrderChildMapper extends BaseMapper<OrderChild> {
             "  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")
+    /**
+     * 统计司机今日的订单数和运费
+     *
+     * 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

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;