Merge branch 'v29.6_ultimate_interaction_20241017' into test_jdk17

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

@@ -1117,7 +1117,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;
@@ -1166,8 +1170,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;
         }
@@ -1182,7 +1185,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;
         }