优化

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

@@ -254,13 +254,6 @@ public class OtcTradeOrderController {
         return success(page);
     }
 
-    @PostMapping("/window/otcOrderList")
-    @OperateLog(type = API)
-    @Operation(summary = "win-分销端订单列表[分页]", description = "根据条件查询订单列表")
-    @PlatTenantEnv
-    public CommonResult<PageResult<TradeOrderRespVO>> getOtcTradeOrderPage(@Valid @RequestBody TradeOrderPageReqVO pageReqVO) {
-        return success(otcTradeOrderService.getOtcTradeOrderPage(pageReqVO));
-    }
 
 
     @PostMapping("/window/paidOrderList")

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

@@ -41,8 +41,6 @@ public interface OtcTradeOrderService {
      */
     CommonResult<?> cancelAuto(Long orderId);
 
-    PageResult<TradeOrderRespVO> getOtcTradeOrderPage(TradeOrderPageReqVO pageReqVO);
-
     PageResult<TradeOrderRespVO> getMiniTradeOrderPage(TradeOrderPageReqVO pageReqVO);
 
     PageResult<TradeOrderRespVO> getPaidOrderPage(TradeOrderPageReqVO pageReqVO);

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

@@ -482,51 +482,6 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
     }
 
 
-    @Override
-    public PageResult<TradeOrderRespVO> getOtcTradeOrderPage(TradeOrderPageReqVO pageReqVO) {
-        IPage<TradeOrderRespVO> page = new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize(), false);
-        if (StringUtils.isNotBlank(pageReqVO.getOrderNo())) {
-            pageReqVO.setTravelDate(null);
-            pageReqVO.setTravelDateStart(null);
-            pageReqVO.setTravelDateEnd(null);
-        }
-        if (pageReqVO.getOrderStatus() != null && pageReqVO.getOrderStatus().contains(6)) {
-            pageReqVO.getOrderStatus().add(13);
-        }
-        LoginUser loginUser = agencyAuthUtils.getLoginUser();
-        AgencyUserLoginInfoRespDTO agencyUserLoginInfo = loginUser.getContext(AGENCY_LOGIN_INFO, AgencyUserLoginInfoRespDTO.class);
-        if (agencyUserLoginInfo != null) {
-            pageReqVO.setStoreId(agencyUserLoginInfo.getStoreId());
-        }
-        Long agencyId = ThreadLocalUtil.getAgencyId();
-        if (agencyId != null) {
-            pageReqVO.setSourceId(agencyId.toString());
-            pageReqVO.setOtcType(1);
-        }
-
-        if (StringUtils.isNotBlank(pageReqVO.getSellerName())) {
-            CommonResult<List<AdminUserRespDTO>> userList = adminUserApi.getUserNameIgnoreTenant(pageReqVO.getSellerName());
-            if (userList.getData() != null && !userList.getData().isEmpty()) {
-                pageReqVO.setSellerId(userList.getData().get(0).getId());
-            }
-        } else if (StringUtils.isNotBlank(pageReqVO.getBusinessName())) {
-            CommonResult<List<AdminUserRespDTO>> userList = adminUserApi.getUserNameIgnoreTenant(pageReqVO.getBusinessName());
-            if (userList.getData() != null && !userList.getData().isEmpty()) {
-                pageReqVO.setSellerId(userList.getData().get(0).getId());
-            }
-        }
-        String key = pageReqVO.hashCode() + "_" + pageReqVO.getPageSize() + "_" + pageReqVO.getPageNo();
-        pageReqVO.setTenantId(TenantContextHolder.getTenantId());
-        TenantContextHolder.setIgnore(true);
-        Long s1 = System.currentTimeMillis();
-        TradeOrderCountRespVO otcTradeOrderUserCount = tradeOrderMapper.getOtcTradeOrderUserCount(pageReqVO, key);
-        page.setTotal(otcTradeOrderUserCount.getOrderNum());
-        IPage<TradeOrderRespVO> iPage = tradeOrderMapper.getOtcTradeOrderUserPage(page, pageReqVO);
-        TenantContextHolder.setIgnore(false);
-        Long s2 = System.currentTimeMillis();
-        log.info("getOtcTradeOrderUserPage执行时间：{}", s2 - s1);
-        return new PageResult<>(iPage.getRecords(), iPage.getTotal());
-    }
 
     @Override
     public PageResult<TradeOrderRespVO> getMiniTradeOrderPage(TradeOrderPageReqVO pageReqVO) {
@@ -1443,23 +1398,6 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
             visitorDetailId.setOriginPrice(tradeVistorReqVO.getPrice());
             visitorDetailId.setProductType(0);
             ShipTradeOrderCreateReqVO.Visitor visitor = getVisitor1(tradeVistorReqVO);
-            visitor.setName(tradeVistorReqVO.getName());
-            visitor.setVid(tradeVistorReqVO.getId());
-            visitor.setMobile(tradeVistorReqVO.getMobile());
-            visitor.setCredentialNo(tradeVistorReqVO.getCardNo());
-            visitor.setCredentialType(tradeVistorReqVO.getCardType());
-            visitor.setYczz(tradeVistorReqVO.getYichang());
-            visitor.setCqzz(tradeVistorReqVO.getChongqing());
-            visitor.setRoomId(tradeVistorReqVO.getRoomId());
-            visitor.setAge(tradeVistorReqVO.getAge());
-            visitor.setBirthday(tradeVistorReqVO.getBirthday());
-            visitor.setGender(tradeVistorReqVO.getGender());
-            visitor.setNationality(tradeVistorReqVO.getNationality());
-            visitor.setCohabitation(tradeVistorReqVO.getCohabitation());
-            visitor.setType(tradeVistorReqVO.getType());
-            visitor.setRoomIndexId(tradeVistorReqVO.getRoomIndexId());
-            visitor.setRoomModelId(tradeVistorReqVO.getRoomModelId());
-            visitor.setFloor(tradeVistorReqVO.getFloor());
             visitorList.add(visitor);
             visitorDetailId.setVisitorList(visitorList);
             visitorDetailId.setCount(1);
@@ -1480,24 +1418,9 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
             List<ShipTradeOrderCreateReqVO.Visitor> visitorList1 = new ArrayList<>();
             for (String touristId : tradeSpuReqVO.getTourist()) {
                 TradeVistorReqVO tradeVistorReqVO = createVO.getTourist().stream().filter(v -> v.getId().equals(touristId)).findFirst().orElseGet(TradeVistorReqVO::new);
-                ShipTradeOrderCreateReqVO.Visitor visitor = new ShipTradeOrderCreateReqVO.Visitor();
-                visitor.setName(tradeVistorReqVO.getName());
-                visitor.setVid(tradeVistorReqVO.getId());
-                visitor.setMobile(tradeVistorReqVO.getMobile());
-                visitor.setCredentialNo(tradeVistorReqVO.getCardNo());
-                visitor.setCredentialType(tradeVistorReqVO.getCardType());
-                visitor.setBirthday(tradeVistorReqVO.getBirthday());
-                visitor.setGender(tradeVistorReqVO.getGender());
-                visitor.setYczz(tradeVistorReqVO.getYichang());
-                visitor.setCqzz(tradeVistorReqVO.getChongqing());
-                visitor.setNationality(tradeVistorReqVO.getNationality());
-                visitor.setRoomId(tradeVistorReqVO.getRoomId());
-                visitor.setCohabitation(tradeVistorReqVO.getCohabitation());
-                visitor.setType(tradeVistorReqVO.getType());
-                visitor.setAge(tradeVistorReqVO.getAge());
-                visitor.setRoomIndexId(tradeVistorReqVO.getRoomIndexId());
-                visitor.setRoomModelId(tradeVistorReqVO.getRoomModelId());
-                visitor.setFloor(tradeVistorReqVO.getFloor());
+                ShipTradeOrderCreateReqVO.Visitor visitor = getVisitor1(tradeVistorReqVO);
+                visitorList1.add(visitor);
+
                 visitorList1.add(visitor);
                 spuMoney = spuMoney.add(tradeSpuReqVO.getPrice());
             }
@@ -1581,6 +1504,8 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
         visitor.setRoomIndexId(tradeVistorReqVO.getRoomIndexId());
         visitor.setRoomModelId(tradeVistorReqVO.getRoomModelId());
         visitor.setFloor(tradeVistorReqVO.getFloor());
+        visitor.setVid(tradeVistorReqVO.getId());
+        visitor.setCohabitation(tradeVistorReqVO.getCohabitation());
         return visitor;
     }
 
@@ -1671,24 +1596,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
             visitorDetailId.setPrice(tradeVistorReqVO.getPrice());
             visitorDetailId.setOriginPrice(tradeVistorReqVO.getPrice());
             visitorDetailId.setProductType(0);
-            ShipTradeOrderCreateReqVO.Visitor visitor = new ShipTradeOrderCreateReqVO.Visitor();
-            visitor.setName(tradeVistorReqVO.getName());
-            visitor.setVid(tradeVistorReqVO.getId());
-            visitor.setMobile(tradeVistorReqVO.getMobile());
-            visitor.setCredentialNo(tradeVistorReqVO.getCardNo());
-            visitor.setCredentialType(tradeVistorReqVO.getCardType());
-            visitor.setYczz(tradeVistorReqVO.getYichang());
-            visitor.setCqzz(tradeVistorReqVO.getChongqing());
-            visitor.setRoomId(tradeVistorReqVO.getRoomId());
-            visitor.setAge(tradeVistorReqVO.getAge());
-            visitor.setBirthday(tradeVistorReqVO.getBirthday());
-            visitor.setGender(tradeVistorReqVO.getGender());
-            visitor.setNationality(tradeVistorReqVO.getNationality());
-            visitor.setCohabitation(tradeVistorReqVO.getCohabitation());
-            visitor.setType(tradeVistorReqVO.getType());
-            visitor.setRoomIndexId(tradeVistorReqVO.getRoomIndexId());
-            visitor.setRoomModelId(tradeVistorReqVO.getRoomModelId());
-            visitor.setFloor(tradeVistorReqVO.getFloor());
+            ShipTradeOrderCreateReqVO.Visitor visitor = getVisitor1(tradeVistorReqVO);
             visitorList.add(visitor);
             visitorDetailId.setVisitorList(visitorList);
             visitorDetailId.setCount(1);
@@ -1711,24 +1619,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
             List<ShipTradeOrderCreateReqVO.Visitor> visitorList1 = new ArrayList<>();
             for (String touristId : tradeSpuReqVO.getTourist()) {
                 TradeVistorReqVO tradeVistorReqVO = createVO.getTourist().stream().filter(v -> v.getId().equals(touristId)).findFirst().orElseGet(TradeVistorReqVO::new);
-                ShipTradeOrderCreateReqVO.Visitor visitor = new ShipTradeOrderCreateReqVO.Visitor();
-                visitor.setName(tradeVistorReqVO.getName());
-                visitor.setVid(tradeVistorReqVO.getId());
-                visitor.setMobile(tradeVistorReqVO.getMobile());
-                visitor.setCredentialNo(tradeVistorReqVO.getCardNo());
-                visitor.setCredentialType(tradeVistorReqVO.getCardType());
-                visitor.setBirthday(tradeVistorReqVO.getBirthday());
-                visitor.setGender(tradeVistorReqVO.getGender());
-                visitor.setYczz(tradeVistorReqVO.getYichang());
-                visitor.setCqzz(tradeVistorReqVO.getChongqing());
-                visitor.setNationality(tradeVistorReqVO.getNationality());
-                visitor.setRoomId(tradeVistorReqVO.getRoomId());
-                visitor.setCohabitation(tradeVistorReqVO.getCohabitation());
-                visitor.setType(tradeVistorReqVO.getType());
-                visitor.setAge(tradeVistorReqVO.getAge());
-                visitor.setRoomIndexId(tradeVistorReqVO.getRoomIndexId());
-                visitor.setRoomModelId(tradeVistorReqVO.getRoomModelId());
-                visitor.setFloor(tradeVistorReqVO.getFloor());
+                ShipTradeOrderCreateReqVO.Visitor visitor = getVisitor1(tradeVistorReqVO);
                 visitorList1.add(visitor);
                 spuMoney = spuMoney.add(tradeSpuReqVO.getPrice());
             }