修改app专属单提示去掉

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

 package com.clx.performance.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.order.feign.OrderFeign;
 import com.clx.order.params.PageOrderGoodsListParam;
 import com.clx.order.vo.feign.FeignOrderVO;
 import com.clx.performance.dao.OrderGoodsDao;
 import com.clx.performance.dao.OrderGoodsDriverTruckDao;
 import com.clx.performance.dao.OrderGoodsTruckBindDao;
-import com.clx.performance.enums.PerformanceResultEnum;
 import com.clx.performance.model.OrderGoods;
 import com.clx.performance.model.OrderGoodsDriverTruck;
 import com.clx.performance.model.OrderGoodsTruckBind;
@@ -18,8 +18,8 @@ import com.clx.performance.vo.app.OrderGoodsAPPVO;
 import com.clx.performance.vo.feign.OrderGoodsFeignVO;
 import com.clx.performance.vo.pc.OrderGoodsVO;
 import com.clx.user.feign.UserClxFeign;
+import com.msl.common.base.Optional;
 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;
@@ -97,9 +97,9 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
         if (StringUtils.equals(orderGoodsListParam.getOrderGoodsType(), "1")) {
             return orderGoodsDao.openOrderPageGoodsList(orderGoodsListParam);
         } else {
-            List<OrderGoodsDriverTruck> truckList = orderGoodsDriverTruckDao.
-                    selectListByDriverUserNo(orderGoodsListParam.getDriverUserNo())
-                    .orElseThrow(PerformanceResultEnum.DATA_NOT_FIND, "当前用户未绑定车辆");
+            Optional<List<OrderGoodsDriverTruck>> truckList = orderGoodsDriverTruckDao.
+                    selectListByDriverUserNo(orderGoodsListParam.getDriverUserNo());
+
             List<String> truckNoList = new ArrayList<>();
 
             //查询当前用户是否是货主
@@ -107,22 +107,25 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
             Result<List<String>> ownTruckByUserNo = userClxFeign.getOwnTruckByUserNo(driverUserNo);
             log.info("通过用户编号:{} 查询本人车辆，查询结果:{}",driverUserNo,ownTruckByUserNo);
             if (Objects.equals(ownTruckByUserNo.getCode(),ResultCodeEnum.SUCCESS.getCode())) {
-                if (CollectionUtils.isEmpty(truckList) &&  ownTruckByUserNo.getData().isEmpty()) {
-                    throw new ServiceSystemException(PerformanceResultEnum.DATA_NOT_FIND, "当前用户未绑定车辆");
+                if ((!truckList.isPresent() || CollectionUtils.isEmpty(truckList.get())) &&  ownTruckByUserNo.getData().isEmpty()) {
+                    log.warn("用户编号:{},当前用户未绑定车辆",driverUserNo);
+                    return new Page<>();
                 }
                 truckNoList.addAll(ownTruckByUserNo.getData());//当前用户自己的车
-                truckNoList.addAll(truckList.stream().map(OrderGoodsDriverTruck::getTruckNo).collect(Collectors.toList()));//当前用户被绑定为司机的车
+                truckNoList.addAll(truckList.get().stream().map(OrderGoodsDriverTruck::getTruckNo).collect(Collectors.toList()));//当前用户被绑定为司机的车
             }
             if(CollectionUtils.isEmpty(truckNoList)){
-                throw new ServiceSystemException(PerformanceResultEnum.DATA_NOT_FIND, "当前用户未绑定车辆");
+                log.warn("用户编号:{},查询车主车辆和作为司机的车辆全未查询到数据",driverUserNo);
+                return new Page<>();
             }
-            List<OrderGoodsTruckBind> orderGoodsDriverTrucks = orderGoodsTruckBindDao.selectListByTruckNo(truckNoList)
-                    .orElseThrow(PerformanceResultEnum.DATA_NOT_FIND, "当前用户没有专属单");
-            if (orderGoodsDriverTrucks.isEmpty()) {
-                throw new ServiceSystemException(PerformanceResultEnum.DATA_NOT_FIND, "当前用户没有专属单");
-
+            Optional<List<OrderGoodsTruckBind>> orderGoodsDriverTrucks = orderGoodsTruckBindDao.selectListByTruckNo(
+                    truckNoList);
+            if (!orderGoodsDriverTrucks.isPresent() ||   orderGoodsDriverTrucks.get().isEmpty()) {
+                log.warn("用户编号:{},无专属单",driverUserNo);
+                return new Page<>();
             }
-            List<String> orderGoodsNoList = orderGoodsDriverTrucks.stream().map(OrderGoodsTruckBind::getOrderGoodsNo).collect(Collectors.toList());
+
+            List<String> orderGoodsNoList = orderGoodsDriverTrucks.get().stream().map(OrderGoodsTruckBind::getOrderGoodsNo).collect(Collectors.toList());
             return orderGoodsDao.exclusiveOrderPageGoodsList(orderGoodsListParam, orderGoodsNoList);
         }
     }