修改app专属单报错

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

@@ -21,12 +21,15 @@ import com.clx.user.feign.UserClxFeign;
 import com.msl.common.enums.ResultCodeEnum;
 import com.msl.common.exception.ServiceSystemException;
 import com.msl.common.result.Result;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -36,6 +39,7 @@ import java.util.stream.Collectors;
  * Time 16:45
  */
 @Service
+@Slf4j
 public class OrderGoodsServiceImpl implements OrderGoodsService {
 
     @Autowired
@@ -95,19 +99,21 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
             List<OrderGoodsDriverTruck> truckList = orderGoodsDriverTruckDao.
                     selectListByDriverUserNo(orderGoodsListParam.getDriverUserNo())
                     .orElseThrow(PerformanceResultEnum.DATA_NOT_FIND, "当前用户未绑定车辆");
-            List<String> truckNoList = null;
-            if (truckList.isEmpty()) {
+            List<String> truckNoList = new ArrayList<>();
+
             //查询当前用户是否是货主
             Long driverUserNo = orderGoodsListParam.getDriverUserNo();
             Result<List<String>> ownTruckByUserNo = userClxFeign.getOwnTruckByUserNo(driverUserNo);
+            log.info("通过用户编号:{} 查询本人车辆，查询结果:{}",driverUserNo,ownTruckByUserNo);
             if (ownTruckByUserNo.getCode().equals(ResultCodeEnum.SUCCESS)) {
-                    if (ownTruckByUserNo.getData().isEmpty()) {
+                if (CollectionUtils.isEmpty(truckList) &&  ownTruckByUserNo.getData().isEmpty()) {
                     throw new ServiceSystemException(PerformanceResultEnum.DATA_NOT_FIND, "当前用户未绑定车辆");
                 }
-                    truckNoList = ownTruckByUserNo.getData();
+                truckNoList.addAll(ownTruckByUserNo.getData());//当前用户自己的车
+                truckNoList.addAll(truckList.stream().map(OrderGoodsDriverTruck::getTruckNo).collect(Collectors.toList()));//当前用户被绑定为司机的车
             }
-            } else {
-                truckNoList = truckList.stream().map(OrderGoodsDriverTruck::getTruckNo).collect(Collectors.toList());
+            if(CollectionUtils.isEmpty(truckNoList)){
+                throw new ServiceSystemException(PerformanceResultEnum.DATA_NOT_FIND, "当前用户未绑定车辆");
             }
             List<OrderGoodsTruckBind> orderGoodsDriverTrucks = orderGoodsTruckBindDao.selectListByTruckNo(truckNoList)
                     .orElseThrow(PerformanceResultEnum.DATA_NOT_FIND, "当前用户没有专属单");