下单流程

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

@@ -183,26 +183,22 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
     @Override
     public CommonResult<OtcTradeOrderCreateRespVO> createMoveOrder(LoginUser loginUser, ShipTradeOrderCreateReqVO shipTradeOrderCreateReqVO) {
         //获取当前分销商信息
-        if(loginUser.getDistributorId()!=null){
+        if(loginUser!=null && loginUser.getDistributorId()!=null){
             shipTradeOrderCreateReqVO.setDistributorId(loginUser.getDistributorId());
         }
         Asserts.isTrue(shipTradeOrderCreateReqVO.getDistributorId()!=null,"分销商ID不能为空");
-//        OtcTradeOrderCreateReqVO otcTradeOrderCreateReqVO = TradeOrderConvert.INSTANCE.convert(shipTradeOrderCreateReqVO);
         //获取当前分销商信息
         DistributorDO distributorDto = distributorMapper.selectById(shipTradeOrderCreateReqVO.getDistributorId());
         //平台产品
         shipTradeOrderCreateReqVO.getOrderProperty().setSourceId(distributorDto.getId().toString());
         shipTradeOrderCreateReqVO.getOrderProperty().setSourceName(distributorDto.getName());
         //只在平台环境中下单
-        Long tenantId = TenantContextHolder.getTenantId();
         TenantContextHolder.setTenantId(distributorDto.getTenantId());
         CommonResult<TradeOrderRespDTO> result = doShipCreateOrder(loginUser,shipTradeOrderCreateReqVO,SellMethodEnum.OTC_MOVE_ORDER);
         if (result.isError()) {
             return CommonResult.error(result);
         }
         OtcTradeOrderCreateRespVO respVO = TradeOrderConvert.INSTANCE.convert(result.getData());
-        TenantContextHolder.setTenantId(tenantId);
-
         return CommonResult.success(respVO);
     }