Merge branch 'v29.6_ultimate_interaction_20241017' into dev_jdk17

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

@@ -221,7 +221,7 @@ public interface OrderChildMapper extends BaseMapper<OrderChild> {
     OrderGoodsTodaySumDTO countTodayOrderGoodsSumByTruckOwnUserNo(Long truckOwnUserNo);
 
     /**
-     * 统计司机今日的订单数和运费
+     * 统计车主今日的订单数和运费
      *
      * 50、60、70 取装车吨数（load_net）* 运费单价
      * 80、90、100 取装车吨数（weight）* 运费单价
@@ -231,10 +231,10 @@ public interface OrderChildMapper extends BaseMapper<OrderChild> {
      */
     @Select("SELECT COUNT(*) AS todayOrderGoodsSum, IFNULL( SUM( freight), 0 ) AS todayEstimateProfit " +
             "FROM( SELECT COUNT(*) AS todayOrderGoodsSum, IFNULL( SUM( CONVERT ( load_net * freight_price, DECIMAL ( 10, 0 ))), 0 ) AS freight " +
-            "FROM order_child WHERE user_no = #{driverUserNo} AND STATUS IN ( 50, 60, 70 ) AND create_time >= CURDATE() AND create_time <= CURDATE() + INTERVAL 1 DAY - INTERVAL 1 SECOND " +
+            "FROM order_child WHERE truck_own_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( SUM( CONVERT ( weight * freight_price, DECIMAL ( 10, 0 ))), 0 ) AS freight " +
-            "FROM order_child WHERE user_no = #{driverUserNo} AND STATUS IN ( 80, 90, 100 ) AND create_time >= CURDATE() AND create_time <= CURDATE() + INTERVAL 1 DAY - INTERVAL 1 SECOND ) " +
+            "FROM order_child WHERE truck_own_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

@@ -1111,7 +1111,11 @@ public class OrderGoodsServiceImpl implements OrderGoodsService, InitializingBea
 
     @Override
     public OrderGoodsTodaySumVO getTodayOrderGoodsSum() {
+        // 初始化赋值
         OrderGoodsTodaySumVO vo = new OrderGoodsTodaySumVO();
+        vo.setTodayOrderGoodsSum(0);
+        vo.setTodayEstimateProfit(BigDecimal.ZERO);
+        // 局部变量赋值
         Integer ownerTruck = 0;
         BigDecimal ownerWeight = BigDecimal.ZERO;
         Integer driver = 0;
@@ -1160,8 +1164,7 @@ public class OrderGoodsServiceImpl implements OrderGoodsService, InitializingBea
     private boolean isTruckOwner(Long trunkOwnerUserNo){
         // 获取车辆新信息
         DriverTruckInfoFeignVo driverTruckInfoFeignVo = Optional.ofNullable(driverFeign
-                        .getDriverTruckInfoByTrunkOwnerUserNo(trunkOwnerUserNo)).filter(Result:: succeed).map(Result::getData)
-                .orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+                        .getDriverTruckInfoByTrunkOwnerUserNo(trunkOwnerUserNo)).filter(Result:: succeed).map(Result::getData).orNull();
         if (Objects.nonNull(driverTruckInfoFeignVo)) {
             return true;
         }
@@ -1176,7 +1179,7 @@ public class OrderGoodsServiceImpl implements OrderGoodsService, InitializingBea
      */
     private boolean isDriver(Long driverUserNo) {
         DriverInfoFeignVo driverInfoFeignVo = Optional.ofNullable(driverFeign.getDriverInfo(driverUserNo)).filter(Result:: succeed).map(Result::getData)
-                .orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+                .orNull();
         if (Objects.nonNull(driverInfoFeignVo)) {
             return true;
         }