下单流程优化

ship-module-trade/ship-module-trade-api/src/main/java/com/yc/ship/module/trade/enums/ErrorCodeConstants.java

@@ -71,6 +71,10 @@ public interface ErrorCodeConstants {
     ErrorCode ORDER_SAVE_EXCEPTION = new ErrorCode(30_001, "订单保存异常");
     ErrorCode SUPPLIER_ORDER_CREATE_FAIL = new ErrorCode(30_002, "供应商订单下单失败");
     ErrorCode ORDER_CREATE_FAIL = new ErrorCode(30_003, "下单失败");
+    ErrorCode ORDER_OTC_FAIL = new ErrorCode(30_003, "当前登录用户不是旅行社");
+    ErrorCode ORDER_STORE_FAIL = new ErrorCode(30_003, "当前登录用户不是门店");
+    ErrorCode ORDER_OTC_NONE = new ErrorCode(30_003, "该旅行社不存在");
+    ErrorCode ORDER_STORE_NONE = new ErrorCode(30_003, "该门店不存在");
     ErrorCode SUPPLIER_SERVICE_ORDER_CREATE_FAIL = new ErrorCode(30_004, "调用供应商服务下单失败");
     ErrorCode SUPPLIER_PLAT_ORDER_CREATE_FAIL = new ErrorCode(30_005, "平台供应商服务下单失败");
     ErrorCode SUPPLIER_ZSHL_ORDER_CREATE_FAIL = new ErrorCode(30_101, "川大票务系统供应商服务下单失败");

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/otc/impl/OtcTradeOrderServiceImpl.java

@@ -94,7 +94,7 @@ import static com.yc.ship.framework.common.exception.util.ServiceExceptionUtil.e
 import static com.yc.ship.framework.common.util.collection.CollectionUtils.convertList;
 import static com.yc.ship.framework.security.core.util.SecurityFrameworkUtils.getLoginUser;
 import static com.yc.ship.module.trade.enums.ApiConstants.*;
-import static com.yc.ship.module.trade.enums.ErrorCodeConstants.ORDER_CHANGE_REFUND_FAIL;
+import static com.yc.ship.module.trade.enums.ErrorCodeConstants.*;
 import static com.yc.ship.module.trade.enums.TravelhubDictTypeConstants.*;
 import static com.yc.ship.module.trade.service.order.TradeOrderService.CHANGE_ORDER_BIZ_LOCK;
 import static com.yc.ship.module.trade.utils.TradeUUCodeUtils.ORDER_PREFIX;
@@ -2320,20 +2320,20 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
         Long storeId = loginUser.getStoreId();
         //获取当前分销商信息
         if(distributorId==null) {
-            throw exception0(500,"当前登录用户不是旅行社");
+            return CommonResult.error(ORDER_OTC_FAIL);
         }
         if(storeId==null) {
-            throw exception0(500,"当前登录用户不是门店");
+            return CommonResult.error(ORDER_STORE_FAIL);
         }
         //获取当前分销商信息
         DistributorDO distributorDO = distributorMapper.selectById(distributorId);
         if(distributorDO==null) {
-            throw exception0(500,"该旅行社不存在");
+            return CommonResult.error(ORDER_OTC_NONE);
         }
         //获取当前门店
         StoreInfoRespDTO storeInfo = storeApi.getStoreInfo(storeId);
         if(storeInfo==null) {
-            throw exception0(500,"该门店不存在");
+            return CommonResult.error(ORDER_STORE_NONE);
         }
 
         List<TradeOrderCountryReqVO> countryData = createVO.getCountryData();