Merge remote-tracking branch 'origin/v4.9_create_goods_child_20230918' into test

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

@@ -18,6 +18,7 @@ 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.enums.ResultCodeEnum;
 import com.msl.common.exception.ServiceSystemException;
 import com.msl.common.result.Result;
 import org.apache.commons.collections4.CollectionUtils;
@@ -100,7 +101,7 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
                 //查询当前用户是否是货主
                 Long driverUserNo = orderGoodsListParam.getDriverUserNo();
                 Result<List<String>> ownTruckByUserNo = userClxFeign.getOwnTruckByUserNo(driverUserNo);
-                if (ownTruckByUserNo.getCode() == 200) {
+                if (ownTruckByUserNo.getCode().equals(ResultCodeEnum.SUCCESS)) {
                     if (ownTruckByUserNo.getData().isEmpty()) {
                         throw new ServiceSystemException(PerformanceResultEnum.DATA_NOT_FIND, "当前用户未绑定车辆");
                     }
@@ -109,9 +110,6 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
             } 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, "当前用户没有专属单");
             if (orderGoodsDriverTrucks.isEmpty()) {