下单流程优化

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/order/OtcTradeOrderController.java

@@ -22,7 +22,6 @@ import com.yc.ship.module.product.dal.dataobject.voyage.VoyageDO;
 import com.yc.ship.module.product.service.voyage.VoyageService;
 import com.yc.ship.module.resource.api.ship.ShipApi;
 import com.yc.ship.module.resource.api.ship.dto.ShipRespDTO;
-import com.yc.ship.module.resource.dal.dataobject.ship.ResourceShipDO;
 import com.yc.ship.module.trade.api.contract.dto.group.WindowCreateOrderGroup;
 import com.yc.ship.module.trade.controller.admin.order.vo.order.*;
 import com.yc.ship.module.trade.controller.admin.order.vo.otc.PrintRespVO;
@@ -30,7 +29,6 @@ import com.yc.ship.module.trade.controller.admin.order.vo.refund.TradeRefundCrea
 import com.yc.ship.module.trade.controller.admin.order.vo.refund.TradeRefundCreateRespVO;
 import com.yc.ship.module.trade.controller.app.otc.vo.AppTradeOrderPageReqVO;
 import com.yc.ship.module.trade.controller.app.otc.vo.AppTradeOrderRespVO;
-import com.yc.ship.module.trade.controller.app.otc.vo.AppTradeSuppTicketOrderVO;
 import com.yc.ship.module.trade.dal.dataobject.contract.ContractDO;
 import com.yc.ship.module.trade.dal.dataobject.insurance.InsuranceDO;
 import com.yc.ship.module.trade.dal.dataobject.order.TradeDetailBaseDO;
@@ -52,7 +50,6 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jodd.util.StringUtil;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.context.annotation.Bean;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -65,7 +62,6 @@ import java.util.*;
 
 import static com.yc.ship.framework.common.pojo.CommonResult.success;
 import static com.yc.ship.framework.operatelog.core.enums.OperateTypeEnum.*;
-import static com.yc.ship.framework.security.core.util.SecurityFrameworkUtils.getLoginUser;
 
 
 /***

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/order/impl/TradeOrderServiceImpl.java

@@ -242,7 +242,7 @@ public class TradeOrderServiceImpl implements TradeOrderService {
             tradeSupplierService.bindVisitor(tradeBindVisitorReqDTO.getOrderId(), visitorDOList);
         }
 
-        return visitorDOList.size() == 0 ? CommonResult.error(ORDER_BIND_VISITOR_FAIL) : CommonResult.success(visitorDOList.size());
+        return visitorDOList.isEmpty() ? CommonResult.error(ORDER_BIND_VISITOR_FAIL) : CommonResult.success(visitorDOList.size());
     }
 
     @Override

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

@@ -10,10 +10,6 @@ import com.yc.ship.module.product.api.dto.ProductSpuRespDTO;
 import com.yc.ship.module.trade.controller.admin.order.vo.order.*;
 import com.yc.ship.module.trade.controller.admin.order.vo.otc.PrintRespVO;
 import com.yc.ship.module.trade.controller.admin.order.vo.refund.*;
-import com.yc.ship.module.trade.controller.admin.supplier.vo.SupplierOrderPageReqVO;
-import com.yc.ship.module.trade.controller.admin.supplier.vo.SupplierOrderRespVO;
-import com.yc.ship.module.trade.controller.admin.supplier.vo.SupplierRefundPageReqVO;
-import com.yc.ship.module.trade.controller.admin.supplier.vo.SupplierRefundRespVO;
 import com.yc.ship.module.trade.dal.dataobject.contract.ContractDO;
 import com.yc.ship.module.trade.dal.dataobject.insurance.InsuranceDO;
 import com.yc.ship.module.trade.dal.dataobject.order.TradeDetailBaseDO;
@@ -29,20 +25,8 @@ public interface OtcTradeOrderService {
      */
     CommonResult<OtcTradeOrderCreateRespVO> windowCreateOrder(LoginUser loginUser, OtcTradeOrderCreateReqVO otcTradeOrderCreateReqVO);
 
-    /**
-     * 旅行社创建订单
-     */
-    CommonResult<OtcTradeOrderCreateRespVO> createMoveOrder(LoginUser loginUser, ShipTradeOrderCreateReqVO otcTradeOrderCreateReqVO);
-
     CommonResult<OtcTradeOrderCreateRespVO> platCreateMoveOrder(LoginUser loginUser, ShipTradeOrderCreateReqVO otcTradeOrderCreateReqVO);
 
-    /**
-     * 窗口支付搬单订单
-     */
-    CommonResult<PayOrderRespVO> windowPayMoveOrder(LoginUser loginUser, PayOrderReqVO payOrderReqVO);
-
-    CommonResult<PayOrderRespVO> platPayMoveOrder(LoginUser loginUser, PayOrderReqVO payOrderReqVO);
-
     /**
      * 窗口支付订单
      */
@@ -136,20 +120,6 @@ public interface OtcTradeOrderService {
 
     List<RefundDetailRespVO> getRefundBatchDetails(Long refundId);
 
-    /**
-     * 获取供应商订单列表
-     */
-    PageResult<SupplierOrderRespVO> getSupplierOrderPage(SupplierOrderPageReqVO pageReqVO);
-
-    List<DetailBaseRespVO> getSupplierOrderDetails(Long supplierOrderId);
-
-    /**
-     * 获取供应商退票订单列表
-     */
-    PageResult<SupplierRefundRespVO> getSupplierRefundPage(SupplierRefundPageReqVO pageReqVO);
-
-    List<DetailBaseRespVO> getSupplierRefundDetails(Long supplierRefundId);
-
     /**
      * 获取退款记录列表
      */

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

@@ -1,7 +1,6 @@
 package com.yc.ship.module.trade.service.otc.impl;
 
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
@@ -20,7 +19,6 @@ import com.yc.ship.framework.tenant.core.context.TenantContextHolder;
 import com.yc.ship.framework.tenant.core.util.TenantUtils;
 import com.yc.ship.module.infra.api.config.ConfigApi;
 import com.yc.ship.module.member.api.address.MemberAddressApi;
-import com.yc.ship.module.member.api.address.dto.MemberAddressRespDTO;
 import com.yc.ship.module.member.api.user.MemberUserApi;
 import com.yc.ship.module.member.api.user.dto.MemberUserRespDTO;
 import com.yc.ship.module.ota.api.OtaDistributorApi;
@@ -32,7 +30,6 @@ import com.yc.ship.module.otc.api.agency.dto.AgencyUserLoginInfoRespDTO;
 import com.yc.ship.module.otc.api.agency.dto.CooperateRespDTO;
 import com.yc.ship.module.otc.api.store.StoreApi;
 import com.yc.ship.module.otc.api.store.dto.StoreInfoRespDTO;
-import com.yc.ship.module.otc.api.store.dto.StoreMachineDTO;
 import com.yc.ship.module.product.api.ProductApi;
 import com.yc.ship.module.product.api.dto.*;
 import com.yc.ship.module.system.api.dict.DictDataApi;
@@ -41,14 +38,9 @@ import com.yc.ship.module.system.api.sms.SmsSendApi;
 import com.yc.ship.module.system.api.user.AdminUserApi;
 import com.yc.ship.module.system.api.user.dto.AdminUserRespDTO;
 import com.yc.ship.module.trade.api.dto.*;
-import com.yc.ship.module.trade.controller.admin.order.vo.market.MarketingRespVO;
 import com.yc.ship.module.trade.controller.admin.order.vo.order.*;
 import com.yc.ship.module.trade.controller.admin.order.vo.otc.PrintRespVO;
 import com.yc.ship.module.trade.controller.admin.order.vo.refund.*;
-import com.yc.ship.module.trade.controller.admin.supplier.vo.SupplierOrderPageReqVO;
-import com.yc.ship.module.trade.controller.admin.supplier.vo.SupplierOrderRespVO;
-import com.yc.ship.module.trade.controller.admin.supplier.vo.SupplierRefundPageReqVO;
-import com.yc.ship.module.trade.controller.admin.supplier.vo.SupplierRefundRespVO;
 import com.yc.ship.module.trade.convert.order.TradeOrderConvert;
 import com.yc.ship.module.trade.dal.dataobject.contract.ContractDO;
 import com.yc.ship.module.trade.dal.dataobject.insurance.InsuranceDO;
@@ -71,7 +63,6 @@ import com.yc.ship.module.trade.service.otc.OtcTradeOrderService;
 import com.yc.ship.module.trade.service.pay.TradeOrderPayService;
 import com.yc.ship.module.trade.service.refund.TradeRefundRepositoryService;
 import com.yc.ship.module.trade.utils.AgencyAuthUtils;
-import com.yc.ship.module.trade.utils.TradeUUCodeUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.redisson.api.RLock;
@@ -89,15 +80,13 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
-import static com.yc.ship.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static com.yc.ship.framework.common.exception.util.ServiceExceptionUtil.exception0;
 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.*;
-import static com.yc.ship.module.trade.enums.TravelhubDictTypeConstants.*;
+import static com.yc.ship.module.trade.enums.TravelhubDictTypeConstants.PRODUCT_BASE_TYPE_SELF;
+import static com.yc.ship.module.trade.enums.TravelhubDictTypeConstants.YES;
 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;
 
 
 /**
@@ -128,8 +117,6 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
     @Resource
     private MemberAddressApi memberAddressApi;
 
-    @Resource
-    private TradeOrderBindMapper orderBindMapper;
     @Resource
     private TradeOrderMapper tradeOrderMapper;
     @Resource
@@ -169,8 +156,6 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
     @Resource
     private AgencyAuthUtils agencyAuthUtils;
 
-    @Resource
-    private TradeUUCodeUtils tradeUUCodeUtils;
 
     @Resource
     private TradeOrderTotalMapper tradeOrderTotalMapper;
@@ -207,28 +192,6 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
         return CommonResult.success(respVO);
     }
 
-    @Override
-    public CommonResult<OtcTradeOrderCreateRespVO> createMoveOrder(LoginUser loginUser, ShipTradeOrderCreateReqVO shipTradeOrderCreateReqVO) {
-        //获取当前分销商信息
-        if(loginUser!=null && loginUser.getDistributorId()!=null){
-            shipTradeOrderCreateReqVO.setDistributorId(loginUser.getDistributorId());
-        }
-        Asserts.isTrue(shipTradeOrderCreateReqVO.getDistributorId()!=null,"分销商ID不能为空");
-        //获取当前分销商信息
-        DistributorDO distributorDto = distributorMapper.selectById(shipTradeOrderCreateReqVO.getDistributorId());
-        //平台产品
-        shipTradeOrderCreateReqVO.getOrderProperty().setSourceId(distributorDto.getId().toString());
-        shipTradeOrderCreateReqVO.getOrderProperty().setSourceName(distributorDto.getName());
-        //只在平台环境中下单
-        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());
-        return CommonResult.success(respVO);
-    }
-
     @Override
     public CommonResult<OtcTradeOrderCreateRespVO> platCreateMoveOrder(LoginUser loginUser, ShipTradeOrderCreateReqVO shipTradeOrderCreateReqVO) {
         if(loginUser.getDistributorId()!=null){
@@ -296,36 +259,6 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
         return  tradeOrderService.createShipOrder(otcTradeOrderCreateReqVO);
     }
 
-    @Override
-    public CommonResult<PayOrderRespVO> windowPayMoveOrder(LoginUser loginUser, PayOrderReqVO payOrderReqVO) {
-        //获取当前分销商信息
-        DistributorRespDTO distributorDto = otaDistributorApi.getDistributorByAccountTenantId(loginUser.getTenantId()).getCheckedData();
-        //当前旅行社信息
-        initPayParams(loginUser,payOrderReqVO);
-        payOrderReqVO.setAccountId(distributorDto.getId().toString());
-        payOrderReqVO.setAccountType(PayAccountTypeEnum.OTC.getType());
-        //只在平台环境中下单
-        Long tenantId = TenantContextHolder.getTenantId();
-        TenantContextHolder.setTenantId(distributorDto.getTenantId());
-        payOrderReqVO.setCanChangePayType(NO);//不能变更支付方式
-        CommonResult<PayOrderRespVO> resp = tradeOrderPayService.payOrder(payOrderReqVO);
-        TenantContextHolder.setTenantId(tenantId);
-        return resp;
-    }
-
-    @Override
-    public CommonResult<PayOrderRespVO> platPayMoveOrder(LoginUser loginUser, PayOrderReqVO payOrderReqVO) {
-
-        TradeOrderDO tradeOrderDO = tradeOrderRepositoryService.getById(payOrderReqVO.getOrderId());
-        payOrderReqVO.setAccountId(tradeOrderDO.getSourceId());
-        payOrderReqVO.setAccountName(tradeOrderDO.getSourceName());
-        payOrderReqVO.setAccountType(PayAccountTypeEnum.OTC.getType());
-        //只在平台环境中下单
-        payOrderReqVO.setCanChangePayType(NO);//不能变更支付方式
-        CommonResult<PayOrderRespVO> resp = tradeOrderPayService.payOrder(payOrderReqVO);
-        return resp;
-    }
-
 
     @Override
     public CommonResult<PayOrderRespVO> windowPayOrder(LoginUser loginUser, PayOrderReqVO payOrderReqVO) {
@@ -2117,37 +2050,6 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
         return tradeDetailMapper.getRefundBatchDetails(refundId);
     }
 
-    @Override
-    public PageResult<SupplierOrderRespVO> getSupplierOrderPage(SupplierOrderPageReqVO pageReqVO) {
-        IPage<SupplierOrderRespVO> page = new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize());
-        Long agencyId = ThreadLocalUtil.getAgencyId();
-        if(agencyId!=null){
-            pageReqVO.setSourceId(agencyId.toString());
-        }
-        pageReqVO.setTenantId(TenantContextHolder.getTenantId());
-        IPage<SupplierOrderRespVO> iPage = tradeOrderMapper.getSupplierOrderPage(page, pageReqVO);
-        return new PageResult<>(iPage.getRecords(), iPage.getTotal());
-    }
-
-    @Override
-    public List<DetailBaseRespVO> getSupplierOrderDetails(Long supplierOrderId) {
-        List<TradeDetailBaseDO> list = tradeDetailBaseMapper.selectList(TradeDetailBaseDO::getPlatSupplierOrderId, supplierOrderId);
-        return BeanUtils.toBean(list, DetailBaseRespVO.class);
-    }
-
-    @Override
-    public PageResult<SupplierRefundRespVO> getSupplierRefundPage(SupplierRefundPageReqVO pageReqVO) {
-        IPage<SupplierRefundRespVO> page = new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize());
-        IPage<SupplierRefundRespVO> iPage = tradeOrderMapper.getSupplierRefundPage(page, pageReqVO);
-        return new PageResult<>(iPage.getRecords(), iPage.getTotal());
-    }
-
-    @Override
-    public List<DetailBaseRespVO> getSupplierRefundDetails(Long supplierRefundId) {
-        //通过供应商退票信息查询退票基础信息
-        return refundDetailBaseMapper.selectDetailBaseList(supplierRefundId);
-    }
-
     @Override
     public PageResult<RefundRecordRespVO> getPageRefundRecord(RefundRecordPageReqVO pageReqVO) {
         IPage<RefundRecordRespVO> page = new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize());