优化

ship-module-marketing/ship-module-marketing-biz/src/main/java/com/yc/ship/module/marketing/controller/admin/coupon/CouponController.java

@@ -97,8 +97,8 @@ public class CouponController {
         Map<Long, AdminUserRespDTO> userMap = CollectionUtils.convertMap(userList, AdminUserRespDTO::getId);
 
         List<Long> couponIds = CollectionUtils.convertList(list, CouponRespVO::getId);
-        List<CouponCodeDO> couponCodeDOS = couponCodeService.getGetNumAndUsedNumList(couponIds);
-        Map<Long, CouponCodeDO> couponCodeMap = CollectionUtils.convertMap(couponCodeDOS, CouponCodeDO::getCouponId);
+        List<CouponCodeDO> couponCodeList = couponCodeService.getGetNumAndUsedNumList(couponIds);
+        Map<Long, CouponCodeDO> couponCodeMap = CollectionUtils.convertMap(couponCodeList, CouponCodeDO::getCouponId);
         list.stream().forEach(item -> {
             MapUtils.findAndThen(userMap, Long.parseLong(item.getCreator()), adminUserRespDTO -> item.setCreator(adminUserRespDTO.getNickname()));
             MapUtils.findAndThen(couponCodeMap, item.getId(), couponCodeDO -> item.setGetAndUseNum(couponCodeDO.getGetNum() + "/" + couponCodeDO.getUsedNum()));

ship-module-marketing/ship-module-marketing-biz/src/main/java/com/yc/ship/module/marketing/controller/app/coupon/AppCouponController.java

@@ -46,18 +46,18 @@ public class AppCouponController {
     @Operation(summary = "获取可以领取的优惠券列表")
     @PreAuthenticated
     public CommonResult<List<AppCouponRespVO>> getCanReceiveCouponList(){
-        List<CouponDO> couponDOS = couponService.getCanReceiveCouponList(getLoginUserId());
-        return CommonResult.success(BeanUtils.toBean(couponDOS, AppCouponRespVO.class));
+        List<CouponDO> couponList = couponService.getCanReceiveCouponList(getLoginUserId());
+        return CommonResult.success(BeanUtils.toBean(couponList, AppCouponRespVO.class));
     }
     @GetMapping("/getCanReceiveCouponListBySpuId")
     @Operation(summary = "获取当前产品可以领取的优惠券列表")
     @PreAuthenticated
     public CommonResult<List<AppCouponRespVO>> getCanReceiveCouponListBySpuId(Long spuId){
-        List<CouponDO> couponDOS = couponService.getCanReceiveCouponListBySpuId(getLoginUserId(), spuId);
-        List<AppCouponRespVO> list = BeanUtils.toBean(couponDOS, AppCouponRespVO.class);
+        List<CouponDO> couponList = couponService.getCanReceiveCouponListBySpuId(getLoginUserId(), spuId);
+        List<AppCouponRespVO> list = BeanUtils.toBean(couponList, AppCouponRespVO.class);
         List<Long> couponIds = CollectionUtils.convertList(list, AppCouponRespVO::getId);
-        List<CouponCodeDO> couponCodeDOS = couponCodeService.getNotUsedCouponCodeList(getLoginUserId(),couponIds);
-        Map<Long, List<CouponCodeDO>> longListMap = CollectionUtils.convertMultiMap(couponCodeDOS, CouponCodeDO::getCouponId);
+        List<CouponCodeDO> couponCodeList = couponCodeService.getNotUsedCouponCodeList(getLoginUserId(),couponIds);
+        Map<Long, List<CouponCodeDO>> longListMap = CollectionUtils.convertMultiMap(couponCodeList, CouponCodeDO::getCouponId);
         list.stream().forEach(item -> {
             List<CouponCodeDO> couponCodeDOList = longListMap.get(item.getId());
             if(couponCodeDOList != null && couponCodeDOList.size() > 0) {
@@ -73,32 +73,32 @@ public class AppCouponController {
     @Operation(summary = "获取已领取的优惠券列表")
     @PreAuthenticated
     public CommonResult<List<AppCouponRespVO>> getReceivedCouponList(){
-        List<CouponDO> couponDOS = couponService.getReceivedCouponList(getLoginUserId());
-        return CommonResult.success(BeanUtils.toBean(couponDOS, AppCouponRespVO.class));
+        List<CouponDO> couponList = couponService.getReceivedCouponList(getLoginUserId());
+        return CommonResult.success(BeanUtils.toBean(couponList, AppCouponRespVO.class));
     }
     //获取我的未使用优惠券列表
     @GetMapping("/getMyUnUseCouponList")
     @Operation(summary = "获取我的未使用优惠券列表")
     @PreAuthenticated
     public CommonResult<List<AppCouponRespVO>> getMyUnUseCouponList(){
-        List<CouponDO> couponDOS = couponService.getMyUnUseCouponList(getLoginUserId());
-        return CommonResult.success(BeanUtils.toBean(couponDOS, AppCouponRespVO.class));
+        List<CouponDO> couponList = couponService.getMyUnUseCouponList(getLoginUserId());
+        return CommonResult.success(BeanUtils.toBean(couponList, AppCouponRespVO.class));
     }
     //获取我的已使用优惠券列表
     @GetMapping("/getMyUsedCouponList")
     @Operation(summary = "获取我的已使用优惠券列表")
     @PreAuthenticated
     public CommonResult<List<AppCouponRespVO>> getMyUsedCouponList(){
-        List<CouponDO> couponDOS = couponService.getMyUsedCouponList(getLoginUserId());
-        return CommonResult.success(BeanUtils.toBean(couponDOS, AppCouponRespVO.class));
+        List<CouponDO> couponList = couponService.getMyUsedCouponList(getLoginUserId());
+        return CommonResult.success(BeanUtils.toBean(couponList, AppCouponRespVO.class));
     }
     //获取我的已过期优惠券列表
     @GetMapping("/getMyExpiredCouponList")
     @Operation(summary = "获取我的已过期优惠券列表")
     @PreAuthenticated
     public CommonResult<List<AppCouponRespVO>> getMyExpiredCouponList(){
-        List<CouponDO> couponDOS = couponService.getMyExpiredCouponList(getLoginUserId());
-        return CommonResult.success(BeanUtils.toBean(couponDOS, AppCouponRespVO.class));
+        List<CouponDO> couponList = couponService.getMyExpiredCouponList(getLoginUserId());
+        return CommonResult.success(BeanUtils.toBean(couponList, AppCouponRespVO.class));
     }
 
     //领取优惠券
@@ -137,7 +137,7 @@ public class AppCouponController {
         if(reqVo.getTravelDate() == null) {
             reqVo.setTravelDate(DateUtil.format(new Date(), DatePattern.NORM_DATETIME_PATTERN));
         }
-        List<CouponDO> couponDOS = couponService.getCanUseCouponList(getLoginUserId(), reqVo);
-        return CommonResult.success(BeanUtils.toBean(couponDOS, AppCouponRespVO.class));
+        List<CouponDO> couponList = couponService.getCanUseCouponList(getLoginUserId(), reqVo);
+        return CommonResult.success(BeanUtils.toBean(couponList, AppCouponRespVO.class));
     }
 }

ship-module-marketing/ship-module-marketing-biz/src/main/java/com/yc/ship/module/marketing/service/coupon/CouponServiceImpl.java

@@ -161,9 +161,9 @@ public class CouponServiceImpl implements CouponService {
         if (Objects.isNull(memberId)) {
             throw exception(AUTH_NOT_LOGIN);
         }
-        List<CouponDO> couponDOS = couponMapper.selectReceivedCouponList(memberId);
-        handleEffectiveTime(couponDOS);
-        return couponDOS;
+        List<CouponDO> couponList = couponMapper.selectReceivedCouponList(memberId);
+        handleEffectiveTime(couponList);
+        return couponList;
     }
 
     @Override
@@ -264,10 +264,10 @@ public class CouponServiceImpl implements CouponService {
 //                type = extraRespDTO.getType();
 //            }
 //        }
-        List<CouponDO> couponDOS = couponMapper.selectCanUseCouponList(memberId, reqVo.getTravelDate());
-        handleEffectiveTime(couponDOS);
+        List<CouponDO> couponList = couponMapper.selectCanUseCouponList(memberId, reqVo.getTravelDate());
+        handleEffectiveTime(couponList);
         Long finalType = type;
-        List<CouponDO> list = couponDOS.stream().filter(couponDO -> {
+        List<CouponDO> list = couponList.stream().filter(couponDO -> {
             BigDecimal basic = couponDO.getBasic();
             Boolean flag = basic.compareTo(reqVo.getOrderAmount()) <= 0;
             //满足门槛金额
@@ -296,23 +296,23 @@ public class CouponServiceImpl implements CouponService {
 
     @Override
     public List<CouponDO> getMyUnUseCouponList(Long loginUserId) {
-        List<CouponDO> couponDOS = couponMapper.selectMyUnUseCouponList(loginUserId);
-        handleEffectiveTime(couponDOS);
-        return couponDOS;
+        List<CouponDO> couponList = couponMapper.selectMyUnUseCouponList(loginUserId);
+        handleEffectiveTime(couponList);
+        return couponList;
     }
 
     @Override
     public List<CouponDO> getMyUsedCouponList(Long loginUserId) {
-        List<CouponDO> couponDOS = couponMapper.selectMyUsedCouponList(loginUserId);
-        handleEffectiveTime(couponDOS);
-        return couponDOS;
+        List<CouponDO> couponList = couponMapper.selectMyUsedCouponList(loginUserId);
+        handleEffectiveTime(couponList);
+        return couponList;
     }
 
     @Override
     public List<CouponDO> getMyExpiredCouponList(Long loginUserId) {
-        List<CouponDO> couponDOS = couponMapper.selectMyExpiredCouponList(loginUserId);
-        handleEffectiveTime(couponDOS);
-        return couponDOS;
+        List<CouponDO> couponList = couponMapper.selectMyExpiredCouponList(loginUserId);
+        handleEffectiveTime(couponList);
+        return couponList;
     }
 
     @Override
@@ -324,8 +324,8 @@ public class CouponServiceImpl implements CouponService {
     public List<CouponDO> getCanReceiveCouponListBySpuId(Long memberId, Long spuId) {
         List<CouponDO> list = this.getCanReceiveCouponList(memberId);
         List<Long> couponIds = CollectionUtils.convertList(list, CouponDO::getId);
-        List<CouponProductDo> couponProductDOS = couponProductService.getListByCouponIds(couponIds);
-        Map<Long, List<CouponProductDo>> longListMap = CollectionUtils.convertMultiMap(couponProductDOS, CouponProductDo::getCouponId);
+        List<CouponProductDo> couponProductList = couponProductService.getListByCouponIds(couponIds);
+        Map<Long, List<CouponProductDo>> longListMap = CollectionUtils.convertMultiMap(couponProductList, CouponProductDo::getCouponId);
         Long type = null;
 //        //小程序子产品
 //        ChildProductDTO childProduct = childProductApi.getChildProduct(spuId);

ship-module-miniapplet/src/main/java/com/yc/ship/module/miniapplet/controller/admin/advert/AdvertController.java

@@ -121,23 +121,23 @@ public class AdvertController {
             throw exception(ADSENSE_NOT_EXISTS);
         }
         Integer type = adsenseDO.getAdsenseType();
-        List<AdvertDO> advertDOS = advertService.getAdvertList(adsenseId);
+        List<AdvertDO> advertList = advertService.getAdvertList(adsenseId);
         if (id != null) {
             // 过滤出 非当前操作的内容ID
-            advertDOS = advertDOS.stream()
+            advertList = advertList.stream()
                     .filter(contentDO -> !id.equals(contentDO.getId()))
                     .collect(Collectors.toList());
         }
         switch (type) {
             case 0:
                 // 单图片
-                if (!advertDOS.isEmpty()) {
+                if (!advertList.isEmpty()) {
                     throw exception(ADSENSE_TYPE_EXCEED);
                 }
                 break;
             case 1:
                 // 单视频
-                if (!advertDOS.isEmpty()) {
+                if (!advertList.isEmpty()) {
                     throw exception(ADSENSE_TYPE_EXCEED);
                 }
                 break;

ship-module-miniapplet/src/main/java/com/yc/ship/module/miniapplet/controller/app/advert/AppAdvertController.java

@@ -53,8 +53,8 @@ public class AppAdvertController {
 
     @PostMapping("/adsenseList")
     public CommonResult<List<AppAdsenseRespVO>> catalogueList(@RequestBody @Valid AppAdvertReqVO reqVO) {
-        List<AdsenseDO> adsenseDOS = adsenseService.getAdsenseList(reqVO);
-        List<AppAdsenseRespVO> respVOS = BeanUtils.toBean(adsenseDOS, AppAdsenseRespVO.class);
+        List<AdsenseDO> adsenseList = adsenseService.getAdsenseList(reqVO);
+        List<AppAdsenseRespVO> respVOS = BeanUtils.toBean(adsenseList, AppAdsenseRespVO.class);
         return success(respVOS);
     }
 
@@ -76,12 +76,12 @@ public class AppAdvertController {
                 return success(respVOS);
             }
         }
-        List<AdvertDO> advertDOS = advertService.getAdvertList(reqVO.getAdsenseId());
+        List<AdvertDO> advertList = advertService.getAdvertList(reqVO.getAdsenseId());
         LocalDateTime now = LocalDateTime.now();
-        advertDOS = advertDOS.stream()
+        advertList = advertList.stream()
                 .filter(advert -> advert.getIsDisplay() == 1 && (advert.getValidType() == 0 || (advert.getValidType() == 1 && (now.isAfter(advert.getStaDate()) && now.isBefore(advert.getEndDate())))))
                 .collect(Collectors.toList());
-        respVOS = BeanUtils.toBean(advertDOS, AppAdvertRespVO.class);
+        respVOS = BeanUtils.toBean(advertList, AppAdvertRespVO.class);
         return success(respVOS);
     }
 

ship-module-miniapplet/src/main/java/com/yc/ship/module/miniapplet/controller/app/problem/AppProblemController.java

@@ -45,8 +45,8 @@ public class AppProblemController {
     @PostMapping("/problemTypeList")
     @Operation(summary = "获取问题类型列表")
     public CommonResult<List<AppProblemTypeRespVO>> problemTypeList(@RequestBody @Valid AppProblemReqVO reqVO) {
-        List<ProblemTypeDO> problemTypeDOS = problemTypeService.getProblemTypeListByApp(reqVO);
-        List<AppProblemTypeRespVO> respVOS = BeanUtils.toBean(problemTypeDOS, AppProblemTypeRespVO.class);
+        List<ProblemTypeDO> problemTypeList = problemTypeService.getProblemTypeListByApp(reqVO);
+        List<AppProblemTypeRespVO> respVOS = BeanUtils.toBean(problemTypeList, AppProblemTypeRespVO.class);
         return success(respVOS);
     }
 
@@ -61,8 +61,8 @@ public class AppProblemController {
     @PostMapping("/problemList")
     @Operation(summary = "获取问题列表")
     public CommonResult<List<AppProblemRespVO>> problemList(@RequestBody @Valid AppProblemReqVO reqVO) {
-        List<ProblemDO> problemDOS = problemService.getProblemList(reqVO);
-        List<AppProblemRespVO> respVOS = BeanUtils.toBean(problemDOS, AppProblemRespVO.class);
+        List<ProblemDO> problemList = problemService.getProblemList(reqVO);
+        List<AppProblemRespVO> respVOS = BeanUtils.toBean(problemList, AppProblemRespVO.class);
         return success(respVOS);
     }
 

ship-module-miniapplet/src/main/java/com/yc/ship/module/miniapplet/service/catalogue/CatalogueServiceImpl.java

@@ -64,8 +64,8 @@ public class CatalogueServiceImpl implements CatalogueService {
 
     @Override
     public void deleteCatalogue(Long id) {
-        List<ContentDO> contentDOS = contentService.getContentList(id, null);
-        if (!contentDOS.isEmpty()) {
+        List<ContentDO> contentList = contentService.getContentList(id, null);
+        if (!contentList.isEmpty()) {
             throw exception(CATALOGUE_BINDING_CONTENT);
         }
         // 删除
@@ -121,8 +121,8 @@ public class CatalogueServiceImpl implements CatalogueService {
     }
 
     private List<Map<String, Object>> getCatalogueTree(Long prentId) {
-        List<CatalogueDO> catalogueDOS = catalogueMapper.getCatalogueByParentId(prentId);
-        return catalogueDOS.stream().map(catalogueDO -> {
+        List<CatalogueDO> catalogueList = catalogueMapper.getCatalogueByParentId(prentId);
+        return catalogueList.stream().map(catalogueDO -> {
             Map<String, Object> data = new HashMap<>(3);
             data.put("value", catalogueDO.getId());
             data.put("label", catalogueDO.getName());

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/controller/admin/distributoraudit/DistributorAuditController.java

@@ -83,8 +83,8 @@ public class DistributorAuditController {
     @PreAuthorize("@ss.hasPermission('ota:distributor-audit:query')")
     public CommonResult<PageResult<DistributorAuditRespVO>> getDistributorAuditPage(@Valid DistributorAuditPageReqVO pageReqVO) {
         PageResult<DistributorAuditDO> pageResult = distributorAuditService.getDistributorAuditPage(pageReqVO);
-        List<DistributorDO> distributorDOS = distributorService.getDistributorList(convertList(pageResult.getList(), DistributorAuditDO::getDistributorId));
-        Map<Long, DistributorDO> distributorMap = CollectionUtils.convertMap(distributorDOS, DistributorDO::getId);
+        List<DistributorDO> distributorList = distributorService.getDistributorList(convertList(pageResult.getList(), DistributorAuditDO::getDistributorId));
+        Map<Long, DistributorDO> distributorMap = CollectionUtils.convertMap(distributorList, DistributorDO::getId);
         return success(new PageResult<>(DistributorConvert.INSTANCE.convertAuditList(pageResult.getList(), distributorMap),
                 pageResult.getTotal()));
 //        return success(BeanUtils.toBean(pageResult, DistributorAuditRespVO.class));
@@ -98,8 +98,8 @@ public class DistributorAuditController {
                                             HttpServletResponse response) throws IOException {
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
         List<DistributorAuditDO> list = distributorAuditService.getDistributorAuditPage(pageReqVO).getList();
-        List<DistributorDO> distributorDOS = distributorService.getDistributorList(convertList(list, DistributorAuditDO::getDistributorId));
-        Map<Long, DistributorDO> distributorMap = CollectionUtils.convertMap(distributorDOS, DistributorDO::getId);
+        List<DistributorDO> distributorList = distributorService.getDistributorList(convertList(list, DistributorAuditDO::getDistributorId));
+        Map<Long, DistributorDO> distributorMap = CollectionUtils.convertMap(distributorList, DistributorDO::getId);
         List<DistributorAuditRespVO> auditRespVOS = DistributorConvert.INSTANCE.convertAuditList(list, distributorMap);
         // 导出 Excel
         ExcelUtils.write(response, "分销商授信提额/授信充值/余额充值.xls", "数据", DistributorAuditRespVO.class, auditRespVOS);

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/controller/admin/distributorauditlog/DistributorAuditLogController.java

@@ -83,8 +83,8 @@ public class DistributorAuditLogController {
     @PreAuthorize("@ss.hasPermission('ota:distributor-audit-log:query')")
     public CommonResult<PageResult<DistributorAuditLogRespVO>> getDistributorAuditLogPage(@Valid DistributorAuditLogPageReqVO pageReqVO) {
         PageResult<DistributorAuditLogDO> pageResult = distributorAuditLogService.getDistributorAuditLogPage(pageReqVO);
-        List<DistributorDO> distributorDOS = distributorService.getDistributorList(convertList(pageResult.getList(), DistributorAuditLogDO::getDistributorId));
-        Map<Long, DistributorDO> distributorMap = CollectionUtils.convertMap(distributorDOS, DistributorDO::getId);
+        List<DistributorDO> distributorList = distributorService.getDistributorList(convertList(pageResult.getList(), DistributorAuditLogDO::getDistributorId));
+        Map<Long, DistributorDO> distributorMap = CollectionUtils.convertMap(distributorList, DistributorDO::getId);
         return success(new PageResult<>(DistributorConvert.INSTANCE.convertAuditLogList(pageResult.getList(), distributorMap),
                 pageResult.getTotal()));
 //        return success(BeanUtils.toBean(pageResult, DistributorAuditLogRespVO.class));
@@ -98,8 +98,8 @@ public class DistributorAuditLogController {
                                                HttpServletResponse response) throws IOException {
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
         List<DistributorAuditLogDO> list = distributorAuditLogService.getDistributorAuditLogPage(pageReqVO).getList();
-        List<DistributorDO> distributorDOS = distributorService.getDistributorList(convertList(list, DistributorAuditLogDO::getDistributorId));
-        Map<Long, DistributorDO> distributorMap = CollectionUtils.convertMap(distributorDOS, DistributorDO::getId);
+        List<DistributorDO> distributorList = distributorService.getDistributorList(convertList(list, DistributorAuditLogDO::getDistributorId));
+        Map<Long, DistributorDO> distributorMap = CollectionUtils.convertMap(distributorList, DistributorDO::getId);
         List<DistributorAuditLogRespVO> auditLogRespVOS = DistributorConvert.INSTANCE.convertAuditLogList(list, distributorMap);
         // 导出 Excel
         ExcelUtils.write(response, "分销商授信额度变更.xls", "数据", DistributorAuditLogRespVO.class, auditLogRespVOS);

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/controller/admin/tradelog/TradeLogController.java

@@ -84,8 +84,8 @@ public class TradeLogController {
 //    @PreAuthorize("@ss.hasPermission('ota:trade-log:query')")
     public CommonResult<PageResult<TradeLogRespVO>> getTradeLogPage(@Valid TradeLogPageReqVO pageReqVO) {
         PageResult<TradeLogDO> pageResult = tradeLogService.getTradeLogPage(pageReqVO);
-        List<DistributorDO> distributorDOS = distributorService.getDistributorList(convertList(pageResult.getList(), TradeLogDO::getDistributorId));
-        Map<Long, DistributorDO> distributorMap = CollectionUtils.convertMap(distributorDOS, DistributorDO::getId);
+        List<DistributorDO> distributorList = distributorService.getDistributorList(convertList(pageResult.getList(), TradeLogDO::getDistributorId));
+        Map<Long, DistributorDO> distributorMap = CollectionUtils.convertMap(distributorList, DistributorDO::getId);
         return success(new PageResult<>(DistributorConvert.INSTANCE.convertTradeLogList(pageResult.getList(), distributorMap),
                 pageResult.getTotal()));
     }
@@ -97,8 +97,8 @@ public class TradeLogController {
     public void exportTradeLogExcel(@Valid TradeLogPageReqVO pageReqVO, HttpServletResponse response) throws IOException {
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
         List<TradeLogDO> list = tradeLogService.getTradeLogPage(pageReqVO).getList();
-        List<DistributorDO> distributorDOS = distributorService.getDistributorList(convertList(list, TradeLogDO::getDistributorId));
-        Map<Long, DistributorDO> distributorMap = CollectionUtils.convertMap(distributorDOS, DistributorDO::getId);
+        List<DistributorDO> distributorList = distributorService.getDistributorList(convertList(list, TradeLogDO::getDistributorId));
+        Map<Long, DistributorDO> distributorMap = CollectionUtils.convertMap(distributorList, DistributorDO::getId);
         List<TradeLogRespVO> respVOS = DistributorConvert.INSTANCE.convertTradeLogList(list, distributorMap);
         // 导出 Excel
         ExcelUtils.write(response, "分销商交易日志.xls", "数据", TradeLogRespVO.class, respVOS);

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/service/distributor/DistributorServiceImpl.java

@@ -595,21 +595,21 @@ public class DistributorServiceImpl implements DistributorService {
         AtomicReference<LoginTypeRespVO> loginType = new AtomicReference<>();
         TenantUtils.executeIgnore(() -> {
             LoginTypeRespVO typeRespVO = null;
-            List<DistributorDO> distributorDOS = getDistributorsByAccountTenantId(TenantContextHolder.getTenantId());
-            if (!distributorDOS.isEmpty()) {
-                DistributorDO distributorDO = distributorDOS.stream().filter(distributor -> !distributor.getTenantId().equals(TenantContextHolder.getTenantId())).findFirst().orElse(null);
+            List<DistributorDO> distributorList = getDistributorsByAccountTenantId(TenantContextHolder.getTenantId());
+            if (!distributorList.isEmpty()) {
+                DistributorDO distributorDO = distributorList.stream().filter(distributor -> !distributor.getTenantId().equals(TenantContextHolder.getTenantId())).findFirst().orElse(null);
                 if (distributorDO != null) {
                     // 旅行社端
                     typeRespVO = new LoginTypeRespVO();
                     typeRespVO.setType(1);
-                    typeRespVO.setDistributorId(distributorDOS.get(0).getId());
+                    typeRespVO.setDistributorId(distributorList.get(0).getId());
                     typeRespVO.setAccountTenantId(distributorDO.getAccountTenantId());
                     typeRespVO.setTenantId(distributorDO.getTenantId());
                     typeRespVO.setDistributorName(distributorDO.getName());
                 } else {
                     long loginUserId = getLoginUserId();
 //                    AdminUserRespDTO respDTO = userApi.getUser(loginUserId).getCheckedData();
-//                    distributorDO = distributorDOS.stream().filter(distributor -> distributor.getLoginName().equals(respDTO.getUsername())).findFirst().orElse(null);
+//                    distributorDO = distributorList.stream().filter(distributor -> distributor.getLoginName().equals(respDTO.getUsername())).findFirst().orElse(null);
 //                    if (distributorDO != null) {
 //                        // OTA 端
 //                        typeRespVO = new LoginTypeRespVO();

ship-module-otc/ship-module-otc-biz/src/main/java/com/yc/ship/module/otc/api/link/LinkApiImpl.java

@@ -49,15 +49,15 @@ public class LinkApiImpl implements LinkApi {
             throw exception0(30_004, "链接不存在！");
         }
         LinkRespDTO linkRespDTO = BeanUtils.toBean(linkDO, LinkRespDTO.class);
-        List<LinkDetailDO> detailDOS = linkDetailService.getLinkDetailByLinkId(id);
-        List<LinkDetailRespDTO> detailRespDTOS = new ArrayList<>(detailDOS.size());
+        List<LinkDetailDO> detailList = linkDetailService.getLinkDetailByLinkId(id);
+        List<LinkDetailRespDTO> detailRespDTOS = new ArrayList<>(detailList.size());
         LinkDetailRespDTO linkDetailRespDTO;
         // 链接类型 1.门店码 2.售票员码
-        List<Long> sourceCodes = convertList(detailDOS, LinkDetailDO::getSourceCode);
+        List<Long> sourceCodes = convertList(detailList, LinkDetailDO::getSourceCode);
         if (linkDO.getType() == 1) {
             // 只查门店
-            List<StoreDO> storeDOS = storeService.getSotreList(sourceCodes);
-            for (StoreDO storeDO : storeDOS) {
+            List<StoreDO> storeList = storeService.getSotreList(sourceCodes);
+            for (StoreDO storeDO : storeList) {
                 linkDetailRespDTO = new LinkDetailRespDTO();
                 linkDetailRespDTO.setStoreId(storeDO.getId());
                 linkDetailRespDTO.setStoreName(storeDO.getStoreName());
@@ -66,13 +66,13 @@ public class LinkApiImpl implements LinkApi {
         }
         if (linkDO.getType() == 2) {
             // 先查售票员 再查门店
-            List<StoreUserDO> storeUserDOS = storeService.getStoreUserList(2, sourceCodes);
-            List<StoreDO> storeDOS = storeService.getSotreList(convertList(storeUserDOS, StoreUserDO::getStoreId));
-            for (StoreUserDO storeUserDO : storeUserDOS) {
+            List<StoreUserDO> storeUserList = storeService.getStoreUserList(2, sourceCodes);
+            List<StoreDO> storeList = storeService.getSotreList(convertList(storeUserList, StoreUserDO::getStoreId));
+            for (StoreUserDO storeUserDO : storeUserList) {
                 linkDetailRespDTO = new LinkDetailRespDTO();
                 linkDetailRespDTO.setUserId(storeUserDO.getUserId());
                 linkDetailRespDTO.setStoreId(storeUserDO.getStoreId());
-                for (StoreDO storeDO : storeDOS) {
+                for (StoreDO storeDO : storeList) {
                     if (storeDO.getId().equals(storeUserDO.getStoreId())) {
                         linkDetailRespDTO.setStoreName(storeDO.getStoreName());
                         break;

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/controller/app/voyage/AppVoyageController.java

@@ -183,8 +183,8 @@ public class AppVoyageController {
         List<PriceCountryRespVO> countryList = priceAreaService.getCountryPriceByObjectId(id);
         respVO.setCountryList(countryList);
         // 区域基准价格
-        List<BasicPriceAreaDO> basicPriceAreaDOS = basicPriceAreaService.getListByObjectId(id);
-        respVO.setBasicAreaList(BeanUtils.toBean(basicPriceAreaDOS, BasicPriceAreaRespVO.class));
+        List<BasicPriceAreaDO> basicPriceAreaList = basicPriceAreaService.getListByObjectId(id);
+        respVO.setBasicAreaList(BeanUtils.toBean(basicPriceAreaList, BasicPriceAreaRespVO.class));
         List<BasicPriceCountryRespVO> basicCountryList = basicPriceAreaService.getCountryPriceByObjectId(id);
         respVO.setBasicCountryList(basicCountryList);
         //附加产品

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/dal/mysql/basicpricearea/BasicPriceAreaMapper.java

@@ -27,8 +27,8 @@ public interface BasicPriceAreaMapper extends BaseMapperX<BasicPriceAreaDO> {
 
     default List<BasicPriceCountryRespVO> selectCountryPriceByObjectId(Long id) {
         List<BasicPriceCountryRespVO> list = new ArrayList<>();
-        List<BasicPriceAreaDO> priceAreaDOS = selectList(new LambdaQueryWrapperX<BasicPriceAreaDO>().eq(BasicPriceAreaDO::getObjectId, id).isNotNull(BasicPriceAreaDO::getParentAreaId));
-        priceAreaDOS.stream().forEach(priceAreaDO -> {
+        List<BasicPriceAreaDO> priceAreaList = selectList(new LambdaQueryWrapperX<BasicPriceAreaDO>().eq(BasicPriceAreaDO::getObjectId, id).isNotNull(BasicPriceAreaDO::getParentAreaId));
+        priceAreaList.stream().forEach(priceAreaDO -> {
             BasicPriceCountryRespVO priceCountryRespVO = new BasicPriceCountryRespVO();
             priceCountryRespVO.setPrice(priceAreaDO.getPrice());
             priceCountryRespVO.setCountryId(priceAreaDO.getAreaId().intValue());

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/dal/mysql/pricearea/PriceAreaMapper.java

@@ -5,7 +5,6 @@ import com.yc.ship.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.yc.ship.module.product.controller.admin.pricetemplate.vo.PriceCountryRespVO;
 import com.yc.ship.module.product.dal.dataobject.pricearea.PriceAreaDO;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Select;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -29,8 +28,8 @@ public interface PriceAreaMapper extends BaseMapperX<PriceAreaDO> {
 
     default List<PriceCountryRespVO> selectCountryPriceByObjectId(Long id) {
         List<PriceCountryRespVO> list = new ArrayList<>();
-        List<PriceAreaDO> priceAreaDOS = selectList(new LambdaQueryWrapperX<PriceAreaDO>().eq(PriceAreaDO::getObjectId, id).isNotNull(PriceAreaDO::getParentAreaId));
-        priceAreaDOS.stream().forEach(priceAreaDO -> {
+        List<PriceAreaDO> priceAreaList = selectList(new LambdaQueryWrapperX<PriceAreaDO>().eq(PriceAreaDO::getObjectId, id).isNotNull(PriceAreaDO::getParentAreaId));
+        priceAreaList.forEach(priceAreaDO -> {
             PriceCountryRespVO priceCountryRespVO = new PriceCountryRespVO();
             priceCountryRespVO.setPrice(priceAreaDO.getPrice());
             priceCountryRespVO.setCountryId(priceAreaDO.getAreaId().intValue());

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/service/pricevoyage/PriceVoyageServiceImpl.java

@@ -192,8 +192,8 @@ public class PriceVoyageServiceImpl implements PriceVoyageService {
         Map<Long, PriceSingleSettingRespVO> settingRespVOMap = CollectionUtils.convertMap(priceSingleSettingRespVOS, PriceSingleSettingRespVO::getRoomModelTypeId);
 
         List<Long> roomModelIds = CollectionUtils.convertList(priceRoomModelRespVOS, item -> item.getRoomModelId());
-        List<ResourceRoomModelDO> roomModelDOS = roomModelService.getList(roomModelIds);
-        Map<Long, ResourceRoomModelDO> resourceRoomModelDOMap = CollectionUtils.convertMap(roomModelDOS, item -> item.getId());
+        List<ResourceRoomModelDO> roomModelList = roomModelService.getList(roomModelIds);
+        Map<Long, ResourceRoomModelDO> resourceRoomModelDOMap = CollectionUtils.convertMap(roomModelList, item -> item.getId());
         List<PriceRoomModelTypeDO> roomModelTypeList = priceRoomModelTypeMapper.selectByObjectId(id);
         List<PriceRoomModelTypeRespVO> priceRoomModelTypeRespVOS = BeanUtils.toBean(roomModelTypeList, PriceRoomModelTypeRespVO.class);
         priceRoomModelTypeRespVOS.forEach(item -> {

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/service/productSpu/ProductSpuServiceImpl.java

@@ -342,12 +342,12 @@ public class ProductSpuServiceImpl implements ProductSpuService {
             ProductBasicRuleDO basicRuleDO = productBasicMapper.selectById(id);
             spuRespVO.setProductBasicRule(BeanUtils.toBean(basicRuleDO, ProductBasicRuleRespVO.class));
 
-            List<SpuShipDO> spuShipDOS = spuShipMapper.selectList(
+            List<SpuShipDO> spuShipList = spuShipMapper.selectList(
                     new LambdaQueryWrapperX<SpuShipDO>()
                     .eqIfPresent(SpuShipDO::getProductId, id)
                     .eq(SpuShipDO::getDeleted, false)
             );
-            String shipIds = spuShipDOS.stream().map(SpuShipDO::getShipId).collect(Collectors.joining(","));
+            String shipIds = spuShipList.stream().map(SpuShipDO::getShipId).collect(Collectors.joining(","));
             spuRespVO.setShipIds(shipIds);
 
             ProductSaleRuleDO saleRuleDO = productSaleMapper.selectById(id);
@@ -681,9 +681,9 @@ public class ProductSpuServiceImpl implements ProductSpuService {
         List<TreeNode>  resultList = new ArrayList<>();
         resultList.addAll(treeList);
         treeList.forEach(treeNode -> {
-            List<ProductSpuDO> productSpuDOS = productSpuMapper.selectListByCategory(Long.parseLong(treeNode.getId().toString()));
-            if (CollUtil.isNotEmpty(productSpuDOS)){
-                List<TreeNode> productTreeList = productSpuDOS.stream().map(e -> new TreeNode<>(e.getId(), e.getCategoryId(), e.getProductName(), e.getSortNum())).collect(Collectors.toList());
+            List<ProductSpuDO> productSpuList = productSpuMapper.selectListByCategory(Long.parseLong(treeNode.getId().toString()));
+            if (CollUtil.isNotEmpty(productSpuList)){
+                List<TreeNode> productTreeList = productSpuList.stream().map(e -> new TreeNode<>(e.getId(), e.getCategoryId(), e.getProductName(), e.getSortNum())).collect(Collectors.toList());
                 resultList.addAll(productTreeList);
             }
         });

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/service/voyage/VoyageServiceImpl.java

@@ -44,7 +44,6 @@ import javax.annotation.Resource;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -154,8 +153,8 @@ public class VoyageServiceImpl implements VoyageService {
                 voyageStockDO.setVoyageId(voyageId);
                 voyageStockMapper.insert(voyageStockDO);
                 //添加库存详情
-                List<VoyageStockDetailDO> stockDetailDOS = new ArrayList<>();
-                list.stream().forEach(item -> {
+                List<VoyageStockDetailDO> stockDetailList = new ArrayList<>();
+                list.forEach(item -> {
                     VoyageStockDetailDO stockDetailDO = new VoyageStockDetailDO();
                     stockDetailDO.setVoyageId(voyageId);
                     stockDetailDO.setRoomModelId(item.getRoomModelId());
@@ -172,9 +171,9 @@ public class VoyageServiceImpl implements VoyageService {
                     stockDetailDO.setVirtualNum(BigDecimal.ZERO);
                     stockDetailDO.setSurplusNum(BigDecimal.valueOf(item.getNum()));
                     stockDetailDO.setShareNum(BigDecimal.ZERO);
-                    stockDetailDOS.add(stockDetailDO);
+                    stockDetailList.add(stockDetailDO);
                 });
-                voyageStockDetailMapper.insertBatch(stockDetailDOS);
+                voyageStockDetailMapper.insertBatch(stockDetailList);
             }
         }finally {
             if(lock.isHeldByCurrentThread() && lock.isLocked()){
@@ -187,13 +186,13 @@ public class VoyageServiceImpl implements VoyageService {
         // 批量插入库存统计数据
         List<VoyageStockDO> voyageStockDOList = new ArrayList<>();
         //添加库存详情
-        List<VoyageStockDetailDO> stockDetailDOS = new ArrayList<>();
+        List<VoyageStockDetailDO> stockDetailList = new ArrayList<>();
         //新增时添加统计数据
         List<RoomModelFloorNumDTO> list = shipApi.queryRoomModelFloorToNum(shipId);
         int intSum = list.stream().mapToInt(RoomModelFloorNumDTO::getNum).sum();
         BigDecimal sum = BigDecimal.valueOf(intSum);
         BigDecimal zero = BigDecimal.ZERO;
-        voyageDOList.stream().forEach(item -> {
+        voyageDOList.forEach(item -> {
             VoyageStockDO voyageStockDO = new VoyageStockDO();
             voyageStockDO.setVoyageId(item.getId());
             voyageStockDO.setVoyageName(item.getName());
@@ -211,7 +210,7 @@ public class VoyageServiceImpl implements VoyageService {
             voyageStockDO.setShareNum(zero);
             voyageStockDO.setVoyageId(item.getId());
             voyageStockDOList.add(voyageStockDO);
-            list.stream().forEach(roomModelFloorNumDTO -> {
+            list.forEach(roomModelFloorNumDTO -> {
                 BigDecimal num = BigDecimal.valueOf(roomModelFloorNumDTO.getNum());
                 VoyageStockDetailDO stockDetailDO = new VoyageStockDetailDO();
                 stockDetailDO.setVoyageId(item.getId());
@@ -229,11 +228,11 @@ public class VoyageServiceImpl implements VoyageService {
                 stockDetailDO.setVirtualNum(zero);
                 stockDetailDO.setSurplusNum(num);
                 stockDetailDO.setShareNum(zero);
-                stockDetailDOS.add(stockDetailDO);
+                stockDetailList.add(stockDetailDO);
             });
         });
         voyageStockMapper.insertBatch(voyageStockDOList);
-        voyageStockDetailMapper.insertBatch(stockDetailDOS);
+        voyageStockDetailMapper.insertBatch(stockDetailList);
     }
 
     @Transactional(rollbackFor = Exception.class)
@@ -312,7 +311,8 @@ public class VoyageServiceImpl implements VoyageService {
         Integer startIntervalDays = createReqVO.getStartIntervalDays();
         Integer leaveIntervalDays = createReqVO.getLeaveIntervalDays();
         PriceTemplateRespVO priceTemplate = null;
-        if(templateId != null) { //有价格模板就生成航次价格
+        if(templateId != null) {
+            //有价格模板就生成航次价格
             priceTemplate = priceTemplateService.getPriceTemplate(templateId);
         }
         // 删除该日期内当前游轮当前航线的所有航次
@@ -320,11 +320,12 @@ public class VoyageServiceImpl implements VoyageService {
 
         ShipRespDTO shipRespDTO = shipApi.queryShip(shipId);
         List<VoyageDO> voyageDOList = new ArrayList<>();
-        while (startDate.compareTo(endDate) <= 0) {
+        while (!startDate.isAfter(endDate)) {
             VoyageDO voyageDO = new VoyageDO();
             Long id = IdUtil.getSnowflakeNextId();
             voyageDO.setId(id);
-            LocalDate leaveDate = startDate.plusDays(voyageDays);// 离船日期
+            // 离船日期
+            LocalDate leaveDate = startDate.plusDays(voyageDays);
             String startDateStr = LocalDateTimeUtil.format(startDate, DatePattern.NORM_DATE_PATTERN);
             voyageDO.setName(shipRespDTO.getName()+startDateStr);
             voyageDO.setCode(VoyageUUCodeUtils.generateVoyageNo(shipRespDTO.getCode(), startDateStr, createReqVO.getBoardingAddress(), createReqVO.getLeaveAddress()));
@@ -349,7 +350,8 @@ public class VoyageServiceImpl implements VoyageService {
             voyageDO.setChildBookingNotice(createReqVO.getChildBookingNotice());
             voyageDO.setBookingNotice(createReqVO.getBookingNotice());
             voyageDOList.add(voyageDO);
-            if(priceTemplate != null) { //有价格模板就生成航次价格
+            //有价格模板就生成航次价格
+            if(priceTemplate != null) { 
                 PriceVoyageSaveReqVO priceVoyageSaveReqVO = new PriceVoyageSaveReqVO();
                 Long priceVoyageId = IdUtil.getSnowflakeNextId();
                 priceVoyageSaveReqVO.setId(priceVoyageId);
@@ -362,37 +364,37 @@ public class VoyageServiceImpl implements VoyageService {
                 priceVoyageSaveReqVO.setStatus(UseStatusEnum.ENABLE.getStatus());
                 // 房型价格系数
                 List<PriceRoomModelRespVO> roomModelList = priceTemplate.getRoomModelList();
-                List<PriceRoomModelDO> priceRoomModelDOS = BeanUtils.toBean(roomModelList, PriceRoomModelDO.class);
-                priceRoomModelDOS.stream().forEach(priceRoomModelDO -> {
+                List<PriceRoomModelDO> priceRoomModelList = BeanUtils.toBean(roomModelList, PriceRoomModelDO.class);
+                priceRoomModelList.forEach(priceRoomModelDO -> {
                     priceRoomModelDO.setObjectId(priceVoyageId);
                     List<PriceRoomModelTypeDO> roomModelTypeList = priceRoomModelDO.getRoomModelTypeList();
-                    roomModelTypeList.stream().forEach(roomModelType -> {
+                    roomModelTypeList.forEach(roomModelType -> {
                         roomModelType.setObjectId(priceVoyageId);
                         PriceSingleSettingDO singleSetting = roomModelType.getSingleSetting();
                         singleSetting.setObjectId(priceVoyageId);
                     });
                 });
-                priceVoyageSaveReqVO.setRoomModelList(priceRoomModelDOS);
+                priceVoyageSaveReqVO.setRoomModelList(priceRoomModelList);
                 // 楼层加价
                 List<PriceFloorRespVO> floorList = priceTemplate.getFloorList();
-                List<PriceFloorDO> priceFloorDOS = BeanUtils.toBean(floorList, PriceFloorDO.class);
-                priceFloorDOS.stream().forEach(priceFloorDO -> priceFloorDO.setObjectId(priceVoyageId));
-                priceVoyageSaveReqVO.setFloorList(priceFloorDOS);
+                List<PriceFloorDO> priceFloorList = BeanUtils.toBean(floorList, PriceFloorDO.class);
+                priceFloorList.forEach(priceFloorDO -> priceFloorDO.setObjectId(priceVoyageId));
+                priceVoyageSaveReqVO.setFloorList(priceFloorList);
                 //区域加价
                 List<PriceAreaRespVO> areaList = priceTemplate.getAreaList();
-                List<PriceAreaDO> priceAreaDOS = BeanUtils.toBean(areaList, PriceAreaDO.class);
-                priceAreaDOS.stream().forEach(priceAreaDO -> priceAreaDO.setObjectId(priceVoyageId));
-                priceVoyageSaveReqVO.setAreaList(priceAreaDOS);
+                List<PriceAreaDO> priceAreaList = BeanUtils.toBean(areaList, PriceAreaDO.class);
+                priceAreaList.forEach(priceAreaDO -> priceAreaDO.setObjectId(priceVoyageId));
+                priceVoyageSaveReqVO.setAreaList(priceAreaList);
                 //区域基准价
                 List<BasicPriceAreaRespVO> basicAreaList = priceTemplate.getBasicAreaList();
-                List<BasicPriceAreaDO> basicPriceAreaDOS = BeanUtils.toBean(basicAreaList, BasicPriceAreaDO.class);
-                basicPriceAreaDOS.stream().forEach(basicPriceAreaDO -> basicPriceAreaDO.setObjectId(priceVoyageId));
-                priceVoyageSaveReqVO.setBasicAreaList(basicPriceAreaDOS);
+                List<BasicPriceAreaDO> basicPriceAreaList = BeanUtils.toBean(basicAreaList, BasicPriceAreaDO.class);
+                basicPriceAreaList.forEach(basicPriceAreaDO -> basicPriceAreaDO.setObjectId(priceVoyageId));
+                priceVoyageSaveReqVO.setBasicAreaList(basicPriceAreaList);
                 // 附加产品
                 List<PriceSpuRespVO> spuList = priceTemplate.getSpuList();
-                List<PriceSpuDO> priceSpuDOS = BeanUtils.toBean(spuList, PriceSpuDO.class);
-                priceSpuDOS.stream().forEach(priceSpuDO -> priceSpuDO.setObjectId(priceVoyageId));
-                priceVoyageSaveReqVO.setSpuList(priceSpuDOS);
+                List<PriceSpuDO> priceSpuList = BeanUtils.toBean(spuList, PriceSpuDO.class);
+                priceSpuList.forEach(priceSpuDO -> priceSpuDO.setObjectId(priceVoyageId));
+                priceVoyageSaveReqVO.setSpuList(priceSpuList);
                 priceVoyageService.createPriceVoyage(priceVoyageSaveReqVO);
             }
 

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/service/voyagestockdetail/VoyageStockDetailService.java

@@ -56,9 +56,9 @@ public interface VoyageStockDetailService {
      *
      * @param voyageId 航次ID
      * @param distributeNum 已分配给分销商的库存
-     * @param stockDistributeNewDOS 分销商库存详情
+     * @param stockDistributeNewList 分销商库存详情
      */
-    void handleShareNum(Long voyageId, BigDecimal distributeNum, List<VoyageStockDistributeNewDO> stockDistributeNewDOS);
+    void handleShareNum(Long voyageId, BigDecimal distributeNum, List<VoyageStockDistributeNewDO> stockDistributeNewList);
 
     /**
      * 批量初始化库存时设置库存的初始值

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/service/voyagestockdetail/VoyageStockDetailServiceImpl.java

@@ -99,19 +99,19 @@ public class VoyageStockDetailServiceImpl implements VoyageStockDetailService {
      * 处理共享库存
      * @param voyageId
      * @param distributeNum 已分配给分销商
-     * stockDistributeNewDOS 分销商库存详情
+     * stockDistributeNewList 分销商库存详情
      */
     @Override
-    public void handleShareNum(Long voyageId,  BigDecimal distributeNum, List<VoyageStockDistributeNewDO> stockDistributeNewDOS) {
+    public void handleShareNum(Long voyageId,  BigDecimal distributeNum, List<VoyageStockDistributeNewDO> stockDistributeNewList) {
         VoyageStockDO stockDO = voyageStockMapper.selectById(voyageId);
         if(distributeNum == null) {
             distributeNum = BigDecimal.ZERO;
         }
         stockDO.setShareNum(stockDO.getCanSellNum().subtract(distributeNum));
         voyageStockMapper.updateById(stockDO);
-        if(stockDistributeNewDOS != null && !stockDistributeNewDOS.isEmpty()) {
-            Map<String, BigDecimal> numMap = CollectionUtils.convertMap(stockDistributeNewDOS, item -> item.getRoomModelId() + "_" + item.getFloor(), item -> item.getNum());
-            Map<String, BigDecimal> totalNumMap = CollectionUtils.convertMap(stockDistributeNewDOS, item -> item.getRoomModelId() + "_" + item.getFloor(), item -> item.getTotalNum());
+        if(stockDistributeNewList != null && !stockDistributeNewList.isEmpty()) {
+            Map<String, BigDecimal> numMap = CollectionUtils.convertMap(stockDistributeNewList, item -> item.getRoomModelId() + "_" + item.getFloor(), item -> item.getNum());
+            Map<String, BigDecimal> totalNumMap = CollectionUtils.convertMap(stockDistributeNewList, item -> item.getRoomModelId() + "_" + item.getFloor(), item -> item.getTotalNum());
             List<VoyageStockDetailDO> list = voyageStockDetailMapper.selectListByVoyageId(voyageId);
             list.stream().forEach(item -> {
                 BigDecimal num = numMap.get(item.getRoomModelId() + "_" + item.getFloor());

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/service/voyagestockdistribute/VoyageStockDistributeNewServiceImpl.java

@@ -224,9 +224,9 @@ public class VoyageStockDistributeNewServiceImpl implements VoyageStockDistribut
         PageResult<VoyageStockRespVO> voyageStockPage = voyageStockService.getVoyageStockPage(pageParams);
         List<VoyageStockRespVO> list = voyageStockPage.getList();
         List<Long> voyageIds = CollectionUtils.convertList(list, VoyageStockRespVO::getVoyageId);
-        List<VoyageStockDistributeNewPageRespVO> distributeNewDOS = voyageStockDistributeNewMapper.selectGroupList(voyageIds, reqVO);
-        Map<Long, BigDecimal> idNumMap = CollectionUtils.convertMap(distributeNewDOS, VoyageStockDistributeNewPageRespVO::getVoyageId, VoyageStockDistributeNewPageRespVO::getNum);
-        Map<Long, BigDecimal> idRoomModelNumMap = CollectionUtils.convertMap(distributeNewDOS, VoyageStockDistributeNewPageRespVO::getVoyageId, VoyageStockDistributeNewPageRespVO::getRoomModelNum);
+        List<VoyageStockDistributeNewPageRespVO> distributeNewList = voyageStockDistributeNewMapper.selectGroupList(voyageIds, reqVO);
+        Map<Long, BigDecimal> idNumMap = CollectionUtils.convertMap(distributeNewList, VoyageStockDistributeNewPageRespVO::getVoyageId, VoyageStockDistributeNewPageRespVO::getNum);
+        Map<Long, BigDecimal> idRoomModelNumMap = CollectionUtils.convertMap(distributeNewList, VoyageStockDistributeNewPageRespVO::getVoyageId, VoyageStockDistributeNewPageRespVO::getRoomModelNum);
         List<VoyageStockDistributeNewPageRespVO> resultList = new ArrayList<>();
         list.forEach(item -> {
             BigDecimal num = idNumMap.get(item.getVoyageId());
@@ -273,8 +273,8 @@ public class VoyageStockDistributeNewServiceImpl implements VoyageStockDistribut
         List<VoyageStockDetailDO> stockDetailDOList = voyageStockDetailService.getListByVoyageId(reqVO.getVoyageId());
         List<VoyageStockDetailDO> stockDetailDOList1 = stockDetailDOList.stream().filter(item -> item.getCanSellNum().compareTo(BigDecimal.ZERO) > 0).collect(Collectors.toList());
         //减去已分配的库存，剩下的就是共享库存
-        List<VoyageStockDistributeNewDO> distributeNewDOS = voyageStockDistributeNewMapper.selectListByVoyageId(reqVO.getVoyageId(), reqVO.getType());
-        Map<String, BigDecimal> distributeNewMap = CollectionUtils.convertMap(distributeNewDOS, item -> item.getRoomModelId() + "_" + item.getFloor(), item -> item.getNum());
+        List<VoyageStockDistributeNewDO> distributeNewList = voyageStockDistributeNewMapper.selectListByVoyageId(reqVO.getVoyageId(), reqVO.getType());
+        Map<String, BigDecimal> distributeNewMap = CollectionUtils.convertMap(distributeNewList, item -> item.getRoomModelId() + "_" + item.getFloor(), item -> item.getNum());
 
         stockDetailDOList1.forEach(item -> {
             BigDecimal bigDecimal = distributeNewMap.get(item.getRoomModelId() + "_" + item.getFloor());

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/service/voyagestockdistribute/VoyageStockDistributeServiceImpl.java

@@ -188,9 +188,9 @@ public class VoyageStockDistributeServiceImpl implements VoyageStockDistributeSe
     public List<VoyageStockDistributeDO> getListByVoyageId(Long voyageId) {
         List<VoyageStockDistributeDO> list = new ArrayList<>();
         VoyageDO voyage = voyageService.getVoyage(voyageId);
-        List<VoyageStockDetailDO> stockDetailDOS = voyageStockDetailService.getListByVoyageId(voyageId);
+        List<VoyageStockDetailDO> stockDetailList = voyageStockDetailService.getListByVoyageId(voyageId);
         // OTA分销商类型数据
-        stockDetailDOS.stream().forEach(item -> {
+        stockDetailList.stream().forEach(item -> {
             VoyageStockDistributeDO stockDistributeDO = new VoyageStockDistributeDO();
             stockDistributeDO.setVoyageId(item.getVoyageId());
             stockDistributeDO.setRoomModelId(item.getRoomModelId());
@@ -205,7 +205,7 @@ public class VoyageStockDistributeServiceImpl implements VoyageStockDistributeSe
             list.add(stockDistributeDO);
         });
         //旅行社分销商类型数据
-        stockDetailDOS.stream().forEach(item -> {
+        stockDetailList.stream().forEach(item -> {
             VoyageStockDistributeDO stockDistributeDO = new VoyageStockDistributeDO();
             stockDistributeDO.setVoyageId(item.getVoyageId());
             stockDistributeDO.setRoomModelId(item.getRoomModelId());
@@ -223,7 +223,7 @@ public class VoyageStockDistributeServiceImpl implements VoyageStockDistributeSe
         //OTA分销商类型的分销商数据
         List<DistributorRespDTO> otaDistributorList = otaDistributorApi.getDistributorList(DistributorTypeEnum.OTA.getType());
         otaDistributorList.stream().forEach(distributor -> {
-            stockDetailDOS.stream().forEach(item -> {
+            stockDetailList.stream().forEach(item -> {
                 VoyageStockDistributeDO stockDistributeDO = new VoyageStockDistributeDO();
                 stockDistributeDO.setVoyageId(item.getVoyageId());
                 stockDistributeDO.setRoomModelId(item.getRoomModelId());
@@ -243,7 +243,7 @@ public class VoyageStockDistributeServiceImpl implements VoyageStockDistributeSe
         List<DistributorRespDTO> otcDistributorList = otaDistributorApi.getDistributorList(DistributorTypeEnum.OTC.getType());
         Map<Long, DistributorRespDTO> otcIdDistributorMap = CollectionUtils.convertMap(otcDistributorList, DistributorRespDTO::getId);
         otcDistributorList.stream().forEach(distributor -> {
-            stockDetailDOS.stream().forEach(item -> {
+            stockDetailList.stream().forEach(item -> {
                 VoyageStockDistributeDO stockDistributeDO = new VoyageStockDistributeDO();
                 stockDistributeDO.setVoyageId(item.getVoyageId());
                 stockDistributeDO.setRoomModelId(item.getRoomModelId());
@@ -262,7 +262,7 @@ public class VoyageStockDistributeServiceImpl implements VoyageStockDistributeSe
         //获取旅行社门店的库存数据
         List<StoreInfoRespDTO> storeList = storeApi.getStoreList();
         storeList.stream().forEach(store -> {
-            stockDetailDOS.stream().forEach(item -> {
+            stockDetailList.stream().forEach(item -> {
                 VoyageStockDistributeDO stockDistributeDO = new VoyageStockDistributeDO();
                 stockDistributeDO.setVoyageId(item.getVoyageId());
                 stockDistributeDO.setRoomModelId(item.getRoomModelId());

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/controller/admin/route/ResourceRouteController.java

@@ -119,8 +119,8 @@ public class ResourceRouteController {
         List<ResourceDockDO> dockList = dockService.getList(dockIdList);
         Map<Long, ResourceDockDO> longResourceDockDOMap = CollectionUtils.convertMap(dockList, ResourceDockDO::getId);
 
-        List<ResourceScenicDO> scenicDOS = scenicService.getList(scenicIds);
-        Map<Long, ResourceScenicDO> longResourceScenicDOMap = CollectionUtils.convertMap(scenicDOS, ResourceScenicDO::getId);
+        List<ResourceScenicDO> scenicList = scenicService.getList(scenicIds);
+        Map<Long, ResourceScenicDO> longResourceScenicDOMap = CollectionUtils.convertMap(scenicList, ResourceScenicDO::getId);
         list.stream().forEach(item -> {
             MapUtils.findAndThen(longResourceDockDOMap, item.getOnDockId(), dock -> item.setOnDockName(dock.getName()));
             MapUtils.findAndThen(longResourceDockDOMap, item.getLeaveDockId(), dock -> item.setLeaveDockName(dock.getName()));

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/controller/admin/ship/ResourceShipController.java

@@ -96,8 +96,8 @@ public class ResourceShipController {
 
         //供应商名称
         List<Long> supplierIds = CollectionUtils.convertList(list, ResourceShipRespVO::getSupplierId);
-        List<ProductSupplierDO> supplierDOS = supplierService.getList(supplierIds);
-        Map<Long, ProductSupplierDO> longProductSupplierDOMap = CollectionUtils.convertMap(supplierDOS, ProductSupplierDO::getId);
+        List<ProductSupplierDO> supplierList = supplierService.getList(supplierIds);
+        Map<Long, ProductSupplierDO> longProductSupplierDOMap = CollectionUtils.convertMap(supplierList, ProductSupplierDO::getId);
 
         list.stream().forEach(item -> {
             MapUtils.findAndThen(longResourceShipTypeDOMap, item.getShipTypeId(), shipType -> item.setShipTypeName(shipType.getName()));

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/service/audit/AuditServiceImpl.java

@@ -61,9 +61,9 @@ public class AuditServiceImpl implements AuditService {
     }
     @Override
     public AuditDO getAuditNewInfo(AuditPageReqVO pageReqVO) {
-        List<AuditDO> auditDOS=auditMapper.getAuditNewInfo(pageReqVO);
-        if(auditDOS.size()>0) {
-            return auditDOS.get(0);
+        List<AuditDO> auditList=auditMapper.getAuditNewInfo(pageReqVO);
+        if(auditList.size()>0) {
+            return auditList.get(0);
         }
         return null;
     }

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/service/category/CategoryServiceImpl.java

@@ -266,8 +266,8 @@ public class CategoryServiceImpl implements CategoryService {
         Long tenantId = TenantContextHolder.getTenantId();
         categoryReqVO.setTenantId(tenantId);
         categoryReqVO.setParentId(reqVO.getId());
-        List<CategoryDO> categoryDOS = getCategoryList(categoryReqVO);
-        List<AppCategoryRespVO> appCategoryRespVOS = BeanUtils.toBean(categoryDOS, AppCategoryRespVO.class);
+        List<CategoryDO> categoryList = getCategoryList(categoryReqVO);
+        List<AppCategoryRespVO> appCategoryRespVOS = BeanUtils.toBean(categoryList, AppCategoryRespVO.class);
         for (AppCategoryRespVO respVO : appCategoryRespVOS) {
             CategoryExtraDO categoryExtraDO = categoryExtraMapper.selectById(respVO.getId());
             respVO.setExtraInfo(BeanUtils.toBean(categoryExtraDO, CategoryExtraRespVO.class));

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/app/order/TradeOrderController.java

@@ -1,18 +1,12 @@
 package com.yc.ship.module.trade.controller.app.order;
 
-import com.alibaba.fastjson.JSON;
 import com.yc.ship.framework.common.pojo.CommonResult;
 import com.yc.ship.framework.operatelog.core.annotations.OperateLog;
-import com.yc.ship.framework.security.core.LoginUser;
-import com.yc.ship.framework.tenant.core.context.TenantContextHolder;
-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.order.PayOrderReqVO;
+import com.yc.ship.module.trade.controller.admin.order.vo.order.PayOrderRespVO;
 import com.yc.ship.module.trade.framework.annotation.PlatTenantEnv;
-import com.yc.ship.module.trade.service.order.AdminTradeOrderService;
-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.TradeRefundService;
-import com.yc.ship.module.trade.utils.AgencyAuthUtils;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
@@ -24,12 +18,12 @@ import javax.validation.Valid;
 import java.util.Map;
 
 import static com.yc.ship.framework.operatelog.core.enums.OperateTypeEnum.TRADE;
-import static com.yc.ship.framework.security.core.util.SecurityFrameworkUtils.getLoginUser;
 
 
 /**
  * @Description ：交易服务controller
- * @Author ：qsl
+ *
+ * @author ：qsl
  * @Date ：2025/6/17 20:52
  */
 @Tag(name = "交易服务controller")
@@ -44,40 +38,29 @@ public class TradeOrderController {
     @Resource
     private TradeOrderPayService tradeOrderPayService;
 
-    @Resource
-    private OtcTradeOrderService otcTradeOrderService;
-    @Resource
-    private AgencyAuthUtils agencyAuthUtils;
-
-    @PostMapping("/orderTest")
-    @Operation(summary = "支付通知")
-    @OperateLog(type = TRADE)
-    public CommonResult<OtcTradeOrderCreateRespVO> platCreateMoveOrder(@Validated(value = WindowCreateOrderGroup.class)  @RequestBody ShipTradeOrderCreateReqVO otcTradeOrderCreateReqVO) {
-        return otcTradeOrderService.platCreateMoveOrder(getLoginUser(), otcTradeOrderCreateReqVO);
-    }
 
     @PostMapping("/payNotify")
     @Operation(summary = "支付通知")
     @OperateLog(type = TRADE)
-    public String payNotify(@RequestParam Map<String, Object> map){
+    public String payNotify(@RequestParam Map<String, Object> map) {
         CommonResult<?> commonResult = tradeOrderPayService.handlePayNotify(map);
-        log.error("支付成功通知，参数{},返回参数{}",map,commonResult.isSuccess());
-        return commonResult.isSuccess()?"success":"fail";
+        log.error("支付成功通知，参数{},返回参数{}", map, commonResult.isSuccess());
+        return commonResult.isSuccess() ? "success" : "fail";
     }
 
     @PostMapping("/refundNotify")
     @Operation(summary = "退款通知")
     @OperateLog(type = TRADE)
-    public String refundNotify(@RequestParam Map<String, Object> map){
+    public String refundNotify(@RequestParam Map<String, Object> map) {
         CommonResult<?> commonResult = tradeRefundService.handleRefundNotify(map);
-        return commonResult.isSuccess()?"success":"fail";
+        return commonResult.isSuccess() ? "success" : "fail";
     }
 
     @GetMapping("/payOrderQuery")
     @Operation(summary = "支付反查，0待支付(轮询) 1已支付 2未支付 8888已支付等待结果(轮询) ")
     @OperateLog(type = TRADE)
     @PlatTenantEnv
-    public CommonResult<?> payOrderQuery(@RequestParam Long payOrderId){
+    public CommonResult<?> payOrderQuery(@RequestParam Long payOrderId) {
         return tradeOrderPayService.payOrderQuery(payOrderId);
     }
 
@@ -85,14 +68,14 @@ public class TradeOrderController {
     @Operation(summary = "查询合同URL")
     @OperateLog(type = TRADE)
     @PlatTenantEnv
-    public CommonResult<?> queryOrderContract(@RequestParam Long payOrderId){
+    public CommonResult<?> queryOrderContract(@RequestParam Long payOrderId) {
         return tradeOrderPayService.queryOrderContract(payOrderId);
     }
 
     @PostMapping("/payOuterOrder")
     @Operation(summary = "外部订单支付")
     @OperateLog(type = TRADE)
-    public CommonResult<PayOrderRespVO>  payOuterOrder(@Valid @RequestBody PayOrderReqVO payOrderReqVO){
+    public CommonResult<PayOrderRespVO> payOuterOrder(@Valid @RequestBody PayOrderReqVO payOrderReqVO) {
         CommonResult<PayOrderRespVO> commonResult = tradeOrderPayService.payOuterOrder(payOrderReqVO);
         return commonResult;
     }

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/dal/dataobject/order/TradeOrderDO.java

@@ -278,6 +278,10 @@ public class TradeOrderDO extends TenantBaseDO {
      * 审核状态 0、无需审核 1、一级审核中  2：二级审核中 3：三级审核中 4：四级审核中 5：审核通过 6：审核驳回
      */
     private Integer auditStatus;
+    /**
+     * 待审核人员ID
+     */
+    private Integer auditUser;
 
     /**
      * 航次ID

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/billrule/BillRuleServiceImpl.java

@@ -61,9 +61,9 @@ public class BillRuleServiceImpl implements BillRuleService {
         //保存选中的旅行社
         for(Long id: createReqVO.getDistributorIds()){
             //查询旅行社是否存在规则
-            List<BillDistributorDO> billDistributorDOS = billDistributorMapper.selectList(new LambdaQueryWrapperX<BillDistributorDO>()
+            List<BillDistributorDO> billDistributorList = billDistributorMapper.selectList(new LambdaQueryWrapperX<BillDistributorDO>()
                     .eq(BillDistributorDO::getDistributorId, id).eq(BillDistributorDO::getDeleted, 0));
-            if(billDistributorDOS.isEmpty()){
+            if(billDistributorList.isEmpty()){
                 BillDistributorDO billDistributorDO = new BillDistributorDO();
                 billDistributorDO.setId(IdWorker.getId());
                 billDistributorDO.setDistributorId(id);
@@ -86,9 +86,9 @@ public class BillRuleServiceImpl implements BillRuleService {
         billDistributorMapper.delete(new LambdaQueryWrapper<BillDistributorDO>().eq(BillDistributorDO::getRuleId, updateReqVO.getId()));
         for(Long id: updateReqVO.getDistributorIds()){
             //查询旅行社是否存在规则
-            List<BillDistributorDO> billDistributorDOS = billDistributorMapper.selectList(new LambdaQueryWrapperX<BillDistributorDO>()
+            List<BillDistributorDO> billDistributorList = billDistributorMapper.selectList(new LambdaQueryWrapperX<BillDistributorDO>()
                     .eq(BillDistributorDO::getDistributorId, id).eq(BillDistributorDO::getDeleted, 0));
-            if(billDistributorDOS.isEmpty()){
+            if(billDistributorList.isEmpty()){
                 BillDistributorDO billDistributorDO = new BillDistributorDO();
                 billDistributorDO.setId(IdWorker.getId());
                 billDistributorDO.setDistributorId(id);
@@ -118,9 +118,9 @@ public class BillRuleServiceImpl implements BillRuleService {
     @Override
     public BillRuleRespVO getBillRule(Long id) {
         BillRuleRespVO vo = BeanUtils.toBean(billRuleMapper.selectById(id), BillRuleRespVO.class);
-         List<BillDistributorDO> billDistributorDOS = billDistributorMapper.selectList(new LambdaQueryWrapperX<BillDistributorDO>()
+         List<BillDistributorDO> billDistributorList = billDistributorMapper.selectList(new LambdaQueryWrapperX<BillDistributorDO>()
                 .eq(BillDistributorDO::getRuleId, id));
-        List<Long> ids = billDistributorDOS.stream().map(BillDistributorDO::getDistributorId).collect(Collectors.toList());
+        List<Long> ids = billDistributorList.stream().map(BillDistributorDO::getDistributorId).collect(Collectors.toList());
         vo.setDistributorIds(ids);
         return vo;
     }

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/invoice/impl/InvoiceGroupServiceImpl.java

@@ -82,8 +82,8 @@ public class InvoiceGroupServiceImpl implements InvoiceGroupService {
 
     @Override
     public CommonResult<InvoiceDO> invoiceIssuance(InvoiceDO invoice, String remark) {
-        List<InvoiceDO> invoiceDOS = new ArrayList<>(Collections.singletonList(invoice));
-        return CommonResult.success(this.invoiceIssuance(invoiceDOS, 0,remark).getCheckedData().get(0));
+        List<InvoiceDO> invoiceList = new ArrayList<>(Collections.singletonList(invoice));
+        return CommonResult.success(this.invoiceIssuance(invoiceList, 0,remark).getCheckedData().get(0));
     }
 
 
@@ -179,9 +179,9 @@ public class InvoiceGroupServiceImpl implements InvoiceGroupService {
                     invoice.setCFphm(fphm);
                     invoice.setInvoiceStatus(InvoiceStatusEnum.INVOICE_SUCCESS.getValue());
                     JSONArray DDKZXX = queryRes.getJSONArray("DDKZXX");
-                    List<InvoiceInventoryDO> inventoryDOS = invoiceInventoryService.getInvoiceInventoryListByInvoiceId(invoice.getId());
+                    List<InvoiceInventoryDO> inventoryList = invoiceInventoryService.getInvoiceInventoryListByInvoiceId(invoice.getId());
                     for (int i = 0; i < DDKZXX.size(); i++) {
-                        InvoiceInventoryDO inventoryDO = inventoryDOS.get(i);
+                        InvoiceInventoryDO inventoryDO = inventoryList.get(i);
                         inventoryDO.setDylzfpmxxh(DDKZXX.getJSONObject(i).getStr("DDQQLSH"));
                         InvoiceInventorySaveReqVO reqVO = BeanUtils.toBean(inventoryDO, InvoiceInventorySaveReqVO.class);
                         invoiceInventoryService.updateInvoiceInventory(reqVO);
@@ -303,10 +303,10 @@ public class InvoiceGroupServiceImpl implements InvoiceGroupService {
             reqBody.set("HZCXSE", BigDecimal.ZERO.subtract(invoice.getCHjse()));
             reqBody.set("CHYYDM", "01");
             reqBody.set("DDH", invoice.getTransactionNo());
-            List<InvoiceInventoryDO> inventoryDOS = invoiceInventoryService.getInvoiceInventoryListByInvoiceId(invoice.getId());
+            List<InvoiceInventoryDO> inventoryList = invoiceInventoryService.getInvoiceInventoryListByInvoiceId(invoice.getId());
             JSONArray details = new JSONArray();
             JSONObject detail;
-            for (InvoiceInventoryDO inventoryDO : inventoryDOS) {
+            for (InvoiceInventoryDO inventoryDO : inventoryList) {
                 detail = new JSONObject();
                 detail.set("LZMXXH", inventoryDO.getSort());
                 detail.set("XH", inventoryDO.getSort());
@@ -565,9 +565,9 @@ public class InvoiceGroupServiceImpl implements InvoiceGroupService {
                                 invoiceDO.setUpdater(sdewmurl);
                                 invoiceDO.setInvoiceStatus(InvoiceStatusEnum.INVOICE_SUCCESS.getValue());
                                 JSONArray DDKZXX = queryRes.getJSONArray("DDKZXX");
-                                List<InvoiceInventoryDO> inventoryDOS = invoiceInventoryService.getInvoiceInventoryListByInvoiceId(invoiceDO.getId());
+                                List<InvoiceInventoryDO> inventoryList = invoiceInventoryService.getInvoiceInventoryListByInvoiceId(invoiceDO.getId());
                                 for (int i = 0; i < DDKZXX.size(); i++) {
-                                    InvoiceInventoryDO inventoryDO = inventoryDOS.get(i);
+                                    InvoiceInventoryDO inventoryDO = inventoryList.get(i);
                                     inventoryDO.setDylzfpmxxh(DDKZXX.getJSONObject(i).getStr("DDQQLSH"));
                                     InvoiceInventorySaveReqVO reqVO = BeanUtils.toBean(inventoryDO, InvoiceInventorySaveReqVO.class);
                                     invoiceInventoryService.updateInvoiceInventory(reqVO);
@@ -672,12 +672,12 @@ public class InvoiceGroupServiceImpl implements InvoiceGroupService {
             reqObj.set("GMFDZYX", invoice.getBuyerEmail());
 
             JSONArray detailArray = new JSONArray();
-            List<InvoiceInventoryDO> inventoryDOS = invoiceInventoryService.getInvoiceInventoryListByInvoiceId(invoice.getId());
+            List<InvoiceInventoryDO> inventoryList = invoiceInventoryService.getInvoiceInventoryListByInvoiceId(invoice.getId());
             JSONObject detailObj;
             BigDecimal taxExcludedAmount = BigDecimal.ZERO;
             BigDecimal se = BigDecimal.ZERO;
             BigDecimal taxIncludedAmount = BigDecimal.ZERO;
-            if (inventoryDOS.isEmpty()) {
+            if (inventoryList.isEmpty()) {
                 int index = 1;
                 detailObj = new JSONObject();
                 detailObj.set("XH", index);
@@ -729,10 +729,10 @@ public class InvoiceGroupServiceImpl implements InvoiceGroupService {
                 saveReqVO.setYhzcbs(0);
 //                saveReqVO.setDylzfpmxxh(dylzfpmxxh);
                 InvoiceInventoryDO invoiceInventoryDO = invoiceInventoryService.createInvoiceInventory(saveReqVO);
-                inventoryDOS = new ArrayList<>(3);
-                inventoryDOS.add(invoiceInventoryDO);
+                inventoryList = new ArrayList<>(3);
+                inventoryList.add(invoiceInventoryDO);
             } else {
-                for (InvoiceInventoryDO invoiceInventoryDO : inventoryDOS) {
+                for (InvoiceInventoryDO invoiceInventoryDO : inventoryList) {
                     detailObj = new JSONObject();
                     detailObj.set("XH", invoiceInventoryDO.getSort());
                     //商品编码

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

@@ -14,8 +14,8 @@ import java.util.List;
 
 /**
  * @Description ：订单查询service实现
- * @Author ：qsl
  * @Date ：2025/6/4 16:18
+ * @author qsl
  */
 @Service
 @Slf4j
@@ -26,20 +26,20 @@ public class TradeOrderQueryServiceImpl implements TradeOrderQueryService {
 
     @Override
     public CommonResult<?> orderByIdCard(String idCard) {
-        List<TradeOrderDO> orderDOS = tradeOrderMapper.getOrderByCardNo(idCard);
-        return CommonResult.success(orderDOS);
+        List<TradeOrderDO> orderList = tradeOrderMapper.getOrderByCardNo(idCard);
+        return CommonResult.success(orderList);
     }
 
     @Override
     public CommonResult<List<TradeOrderRespVO>> orderListByOta(Long tenantId, String travelDate, String credentialNo, String mobile) {
-        List<TradeOrderDO> orderDOS = tradeOrderMapper.orderListByOta(tenantId, travelDate, credentialNo, mobile);
-        return CommonResult.success(BeanUtils.toBean(orderDOS, TradeOrderRespVO.class));
+        List<TradeOrderDO> orderList = tradeOrderMapper.orderListByOta(tenantId, travelDate, credentialNo, mobile);
+        return CommonResult.success(BeanUtils.toBean(orderList, TradeOrderRespVO.class));
     }
 
     @Override
     public CommonResult<List<TradeOrderRespVO>> orderList(Long tenantId,List<Integer> orderStatus, String travelDate, String credentialNo, String mobile) {
-        List<TradeOrderDO> orderDOS = tradeOrderMapper.orderList(tenantId,orderStatus, travelDate, credentialNo, mobile,credentialNo);
-        return CommonResult.success(BeanUtils.toBean(orderDOS, TradeOrderRespVO.class));
+        List<TradeOrderDO> orderList = tradeOrderMapper.orderList(tenantId,orderStatus, travelDate, credentialNo, mobile,credentialNo);
+        return CommonResult.success(BeanUtils.toBean(orderList, TradeOrderRespVO.class));
     }
 
 }

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/ota/impl/XieChengServiceImpl.java

@@ -17,7 +17,6 @@ import com.yc.ship.framework.common.exception.ServerException;
 import com.yc.ship.framework.common.pojo.CommonResult;
 import com.yc.ship.framework.common.util.collection.CollectionUtils;
 import com.yc.ship.framework.tenant.core.context.TenantContextHolder;
-import com.yc.ship.module.infra.api.config.ConfigApi;
 import com.yc.ship.module.ota.api.OtaDistributorApi;
 import com.yc.ship.module.ota.api.dto.DistributorProductRespDTO;
 import com.yc.ship.module.ota.api.dto.DistributorRespDTO;
@@ -89,8 +88,6 @@ public class XieChengServiceImpl implements XieChengService, OtaService {
     @Resource
     private TradeOrderRepositoryService tradeOrderRepositoryService;
     @Resource
-    private ConfigApi configApi;
-    @Resource
     private TradeOrderPayService tradeOrderPayService;
     @Resource
     private XieChengService xieChengService;
@@ -128,9 +125,6 @@ public class XieChengServiceImpl implements XieChengService, OtaService {
                 if (lock.tryLock(30, 60, TimeUnit.SECONDS)) {
                     try {
                         // 签名认证
-                        //String xmlBody = getXmlBodyString(data);
-                        XieChengResolver resolver = new XieChengResolver();
-
                         String secret = distributor.getSecret();
                         JSONObject secretJson = JSONUtil.parseObj(secret);
                         distributor.setAesSecret(secretJson.getStr("aesSecret"));
@@ -156,28 +150,25 @@ public class XieChengServiceImpl implements XieChengService, OtaService {
                             return this.queryOrder(distributor, body, request);
                         }
 
-                    } catch (Exception ex) {
-                        // log.debug("执行异常");
-                        throw ex;
                     } finally {
                         if (lock.isLocked() && lock.isHeldByCurrentThread()) {
                             lock.unlock();
                         }
                     }
                 } else {
-                     log.debug("未获取到锁");
+                    log.debug("未获取到锁");
                     throw exception(OTA_REQUEST_TIMEOUT);
                 }
             } catch (Exception ex) {
-                log.error("携程异常：",ex);
+                log.error("携程异常：", ex);
                 throw ex;
             }
 
         } catch (ServerException e) {
-             log.info("携程：请求参数-解析失败.");
+            log.info("携程：请求参数-解析失败.");
             return xieChengReturn("0002", e.getMessage(), distributor, null);
         } catch (Exception e) {
-             log.error("携程：", e);
+            log.error("携程：", e);
             return xieChengReturn("0003", "签名错误", distributor, null);
         }
         return "";
@@ -185,9 +176,6 @@ public class XieChengServiceImpl implements XieChengService, OtaService {
 
     /**
      * 校验订单
-     *
-     * @return
-     * @throws Exception
      */
     String verifyOrder(DistributorRespDTO distributor, JSONObject body) {
         try {
@@ -211,9 +199,9 @@ public class XieChengServiceImpl implements XieChengService, OtaService {
             // 获取商品信息
             JSONObject item = (JSONObject) items.get(0);
             JSONObject res_body = new JSONObject();
-            res_body.put("inventory", "0");
+            res_body.set("inventory", "0");
             CommonResult<DistributorProductRespDTO> productResult = otaDistributorApi.getDistributorProductById(item.getLong("PLU"));
-            if (productResult.isError()){
+            if (productResult.isError()) {
                 return xieChengReturn("1001", "产品不存在或已下架！", distributor, res_body);
             }
             DistributorProductRespDTO distributorProduct = productResult.getCheckedData();
@@ -257,28 +245,15 @@ public class XieChengServiceImpl implements XieChengService, OtaService {
 
             JSONArray itemss = new JSONArray();
             JSONObject it = new JSONObject();
-            it.put("PLU", productId);
+            it.set("PLU", productId);
             JSONArray inventorys = new JSONArray();
-            it.put("inventorys", inventorys);
+            it.set("inventorys", inventorys);
             JSONObject dateInventory = new JSONObject();
-            dateInventory.put("useDate", useDate);
+            dateInventory.set("useDate", useDate);
             inventorys.add(dateInventory);
             itemss.add(it);
 
             TradeOrderCreateReqDTO order = this.parseOrder(body, distributor);
-//            //验证分销产品库存
-//            StockDistributorDeductReqDTO deductReqDTO = new StockDistributorDeductReqDTO();
-//            deductReqDTO.setDistributorProductId(productId);
-//            deductReqDTO.setNum(count);
-//            deductReqDTO.setUseDate(order.getTravelDate());
-//            try {
-//                stockApi.deductDistributorStock(deductReqDTO).getCheckedData();
-//            } catch (Exception e) {
-//                log.error("携程扣减库存异常：{}",  e.getMessage());
-//                Integer stock = stockApi.getDistributorStock(deductReqDTO).getCheckedData();
-//                res_body.put("inventory", stock);
-//                return xieChengReturn("1003", "库存不足！", distributor, res_body);
-//            }
             //验证销售规则
             TradeOrderRuleValidate.checkSaleRule(order.getItemlList().get(0), productSpuRespDTO);
             return xieChengReturn("0000", "验证成功！", distributor, res_body);
@@ -294,10 +269,6 @@ public class XieChengServiceImpl implements XieChengService, OtaService {
 
     /**
      * 创建订单
-     *
-     * @param body
-     * @return
-     * @throws Exception
      */
     String createOrder(DistributorRespDTO distributor, JSONObject body) {
         RLock lock = null;
@@ -330,19 +301,12 @@ public class XieChengServiceImpl implements XieChengService, OtaService {
 
     /**
      * 带事务的创建订单
-     *
-     * @param otaOrderNo
-     * @param order
-     * @param isPay
-     * @return
      */
     @Override
     public String savePayOrder(String otaOrderNo, TradeOrderCreateReqDTO order, boolean isPay, DistributorRespDTO distributor) {
-        JSONObject object = new JSONObject();
-
-        String orderNo = "";
-        String msg = "";
-        Long orderId = null;
+        String orderNo;
+        String msg;
+        Long orderId;
         //重复验证
         TradeOrderDO tradeOrder = tradeOrderRepositoryService.getOrderByOtaAndExternalOrderNo(otaOrderNo, order.getOrderProperty().getSourceId());
         if (tradeOrder == null) {
@@ -363,7 +327,7 @@ public class XieChengServiceImpl implements XieChengService, OtaService {
                 payOrderReqVO.setPayAmount(order.getPayAmount());
                 //预付款>授信
                 Object[] payTypes = distributor.getPayType().split(",");
-                if (CollectionUtils.containsAny("1",  payTypes)) {
+                if (CollectionUtils.containsAny("1", payTypes)) {
                     payOrderReqVO.setPayType(PayTypeEnum.ADVANCE_PAYMENT.getType());
                 } else if (CollectionUtils.containsAny("2", payTypes)) {
                     payOrderReqVO.setPayType(PayTypeEnum.CREDIT_GRANTING.getType());
@@ -378,11 +342,11 @@ public class XieChengServiceImpl implements XieChengService, OtaService {
             orderNo = tradeOrderRespDTO.getOrderNo();
             orderId = tradeOrderRespDTO.getOrderId();
             // 如果订单未支付
-        } else if (ObjectUtil.equals(tradeOrder.getOrderStatus() , TradeOrderStatusEnum.UNPAID.getStatus())) {
+        } else if (ObjectUtil.equals(tradeOrder.getOrderStatus(), TradeOrderStatusEnum.UNPAID.getStatus())) {
             msg = "订单状态为待付款(未扣余额)";
             return xieChengReturn("1101", msg, distributor, null);
             // 如果订单已过期
-        } else if (ObjectUtil.equals(tradeOrder.getOrderStatus() , TradeOrderStatusEnum.EXPIRED.getStatus())) {
+        } else if (ObjectUtil.equals(tradeOrder.getOrderStatus(), TradeOrderStatusEnum.EXPIRED.getStatus())) {
             msg = "订单状态为已过期";
             return xieChengReturn("1102", msg, distributor, null);
         } else {
@@ -390,23 +354,15 @@ public class XieChengServiceImpl implements XieChengService, OtaService {
             orderNo = tradeOrder.getOrderNo();
             orderId = tradeOrder.getId();
         }
-        //获取库存
-//        int inventory = 0;
-//        if(order.getTicketTypeList() != null && order.getTicketTypeList().size()>0){
-//            TicketTypeVo ticket = order.getTicketTypeList().get(0);
-//            if(ticket != null && StringUtils.isNotEmpty(ticket.getTicketTypeId())){
-//                inventory = stockService.queryTotalNum(ticket.getTicketTypeId());
-//            }
-//        }
-        JSONObject res_body = new JSONObject();
+        JSONObject resBody = new JSONObject();
 //        res_body.put("inventory", String.valueOf(inventory));//剩余票数
-        res_body.put("otaOrderId", otaOrderNo);
-        res_body.put("supplierOrderId", orderNo);
+        resBody.set("otaOrderId", otaOrderNo);
+        resBody.set("supplierOrderId", orderNo);
         // 1.新订已确认（当confirmType =1/2时可同步返回确认结果）
         // 2.新订待确认（当confirmType =2时需异步返回确认结果的）
-        res_body.put("supplierConfirmType", "1");
+        resBody.set("supplierConfirmType", "1");
         // 凭证发送方 1.携程发送凭证 2.供应商发送凭证
-        res_body.put("voucherSender", "1");
+        resBody.set("voucherSender", "1");
         // 凭证集合节点 当supplierConfirmType=1时可返回值；当supplierConfirmType=2时不返回值；
         JSONArray vouchers = new JSONArray();
         //出行人凭证关系节点
@@ -414,45 +370,45 @@ public class XieChengServiceImpl implements XieChengService, OtaService {
         List<TradeDetailDO> detailDOList = tradeOrderRepositoryService.queryDetailByOrderId(orderId);
         for (TradeDetailDO tradeDetail : detailDOList) {
             JSONObject voucher = new JSONObject();
-            voucher.put("itemId", order.getItemId());
+            voucher.set("itemId", order.getItemId());
             // 凭证形式
-            voucher.put("voucherType", 3);
-            voucher.put("voucherCode", tradeDetail.getVoucherCode());
-            voucher.put("voucherData", tradeDetail.getVoucherCode());
+            voucher.set("voucherType", 3);
+            voucher.set("voucherCode", tradeDetail.getVoucherCode());
+            voucher.set("voucherData", tradeDetail.getVoucherCode());
             String passengerId = "";
-            List<TradeVisitorDO> visitorDOS = tradeOrderRepositoryService.queryVisitorByDetailId(tradeDetail.getId());
-            if (CollUtil.isNotEmpty(visitorDOS)) {
-                passengerId= visitorDOS.get(0).getOtaDetailId();
+            List<TradeVisitorDO> visitorList = tradeOrderRepositoryService.queryVisitorByDetailId(tradeDetail.getId());
+            if (CollUtil.isNotEmpty(visitorList)) {
+                passengerId = visitorList.get(0).getOtaDetailId();
             }
             // 出行人编号非空时
             if (StringUtils.isNotBlank(passengerId)) {
                 // 票号
-                voucher.put("voucherId", tradeDetail.getVoucherCode());
+                voucher.set("voucherId", tradeDetail.getVoucherCode());
                 JSONObject passengerVoucher = new JSONObject();
                 // 出行人编号
-                passengerVoucher.put("passengerId", passengerId);
+                passengerVoucher.set("passengerId", passengerId);
                 // 凭证编号
-                passengerVoucher.put("voucherId", tradeDetail.getVoucherCode());
+                passengerVoucher.set("voucherId", tradeDetail.getVoucherCode());
                 // 添加
                 passengerVouchers.add(passengerVoucher);
             }
             vouchers.add(voucher);
         }
-        res_body.put("vouchers", vouchers);
+        resBody.set("vouchers", vouchers);
         // 出行人凭证关系节点非空
         if (CollectionUtil.isNotEmpty(passengerVouchers)) {
             JSONArray itemsJsonArray = new JSONArray();
             JSONObject itemJsonObject = new JSONObject();
-            itemJsonObject.put("itemId", order.getItemId());
+            itemJsonObject.set("itemId", order.getItemId());
             // 是否出行人与凭证有关联关系 相关：isCredentialVouchers=1 不相关：isCredentialVouchers=0
-            itemJsonObject.put("isCredentialVouchers", 1);
+            itemJsonObject.set("isCredentialVouchers", 1);
             // 出行人凭证关系节点
-            itemJsonObject.put("passengerVouchers", passengerVouchers);
+            itemJsonObject.set("passengerVouchers", passengerVouchers);
             // 添加
             itemsJsonArray.add(itemJsonObject);
-            res_body.put("items", itemsJsonArray);
+            resBody.set("items", itemsJsonArray);
         }
-        return xieChengReturn("0000", msg, distributor, res_body);
+        return xieChengReturn("0000", msg, distributor, resBody);
     }
 
     /**
@@ -476,7 +432,7 @@ public class XieChengServiceImpl implements XieChengService, OtaService {
             throw new ServerException(1006, "报文不正确,contacts必填！");
         }
         // 联系人不能为空
-        if (contacts == null || contacts.size() <= 0) {
+        if (contacts == null || contacts.isEmpty()) {
             throw new ServerException(1006, "报文不正确,contacts必填！");
         }
 
@@ -525,7 +481,7 @@ public class XieChengServiceImpl implements XieChengService, OtaService {
         order.setTravelDate(travelDate);
 
         CommonResult<DistributorProductRespDTO> productResult = otaDistributorApi.getDistributorProductById(distributorProductId);
-        if (productResult.isError()){
+        if (productResult.isError()) {
             throw new ServerException(1001, "产品不存在或已下架！");
         }
         DistributorProductRespDTO distributorProduct = productResult.getCheckedData();
@@ -535,28 +491,11 @@ public class XieChengServiceImpl implements XieChengService, OtaService {
         TradeOrderCreateReqDTO.OrderProperty orderProperty = OtaConvert.INSTANCE.convert(distributorId.toString(), distributor.getName());
         order.setOrderProperty(orderProperty);
         order.setRoutePlanId(distributorProduct.getRoutePlanId());
-        if (null == distributorProduct || distributorProduct.getIsUse() != 1) {
+        if (distributorProduct.getIsUse() != 1) {
             throw new ServerException(1001, "产品已经下架！");
         }
-
-        // 关闭校验产品结算价 是:1 否:0
-//        String closeVarContractPrice =
-//                paramConfigService.queryParamConfigValueByCondition("system", "close_var_contract_price", tenantId);
-
         // 单位:元
         BigDecimal ticketPrice = distributorProduct.getSalePrice();
-//        if (null != travelDate) {
-//            StockDayPriceQueryReqDTO queryReqDTO = new StockDayPriceQueryReqDTO();
-//            queryReqDTO.setBusinessId(distributorProductId);
-//            queryReqDTO.setType(StockTypeEnum.DISTRIBUTOR_PRODUCT.getValue());
-//            queryReqDTO.setDate(DateUtil.format(travelDate, DatePattern.NORM_DATE_FORMATTER));
-//            //查询日历价格
-//            CommonResult<StockDayPriceRespDTO>  stockDayPrice = stockApi.getStockDayPrice(queryReqDTO);
-//            if(stockDayPrice.getCode() == 0){
-//                ticketPrice =stockDayPrice.getData().getPrice();
-//            }
-//
-//        }
 
         if (ticketPrice != null) {
             BigDecimal orderAmt = ticketPrice.multiply(new BigDecimal(count));
@@ -568,8 +507,8 @@ public class XieChengServiceImpl implements XieChengService, OtaService {
         orderItem.setProductType(PRODUCT_BASE_TYPE_SELF);
         orderItem.setUseDate(travelDate);
 
-        List<DistributorProductRespDTO.DistributorProjectDTO> distributorProjectDTOS = otaDistributorApi.getProductByDistributor(distributor.getId(),distributorProduct.getProductId(),distributorProduct.getId()).getCheckedData();
-        TradeOrderCreateReqDTO.OrderDetail orderDetail = OtaConvert.INSTANCE.convert(distributorProduct, count,distributorProjectDTOS,ticketPrice);
+        List<DistributorProductRespDTO.DistributorProjectDTO> distributorProjectDTOS = otaDistributorApi.getProductByDistributor(distributor.getId(), distributorProduct.getProductId(), distributorProduct.getId()).getCheckedData();
+        TradeOrderCreateReqDTO.OrderDetail orderDetail = OtaConvert.INSTANCE.convert(distributorProduct, count, distributorProjectDTOS, ticketPrice);
 
         List<TradeOrderCreateReqDTO.Visitor> visitors = new ArrayList<>();
         JSONArray passengers;
@@ -581,12 +520,12 @@ public class XieChengServiceImpl implements XieChengService, OtaService {
                 JSONObject passenger = (JSONObject) p;
                 TradeOrderCreateReqDTO.Visitor visitor = new TradeOrderCreateReqDTO.Visitor();
                 // 出行人手机号
-                String d_mobile = passenger.getStr("mobile");
+                String dMobile = passenger.getStr("mobile");
                 //出行人证件号，可空，实名制产品必传
                 visitor.setCredentialNo(passenger.getStr("cardNo"));
                 // 出行人证件类型，默认身份证，具体定义参见附录4.2
 
-                visitor.setCredentialType( this.changeCertificateType(passenger.getStr("cardType")));
+                visitor.setCredentialType(this.changeCertificateType(passenger.getStr("cardType")));
                 // 出行人姓名，需要支持中/英文
                 visitor.setName(passenger.getStr("name"));
                 visitor.setOtaDetailId(passenger.getStr("passengerId"));
@@ -600,13 +539,13 @@ public class XieChengServiceImpl implements XieChengService, OtaService {
         } else if (productSaleRule != null && productSaleRule.getIsLimitType() == 0) {
             // throw new RRException("本商品为实名制商品，出行人必填！");
             // 非实名制购票
-            if (item.containsKey("passengers") && item.getJSONArray("passengers").size() > 0 && count == item.getJSONArray("passengers").size()) {
+            if (item.containsKey("passengers") && !item.getJSONArray("passengers").isEmpty() && count == item.getJSONArray("passengers").size()) {
                 passengers = item.getJSONArray("passengers");
                 for (Object p : passengers) {
                     JSONObject passenger = (JSONObject) p;
                     TradeOrderCreateReqDTO.Visitor visitor = new TradeOrderCreateReqDTO.Visitor();
                     // 出行人手机号
-                    String d_mobile = passenger.getStr("mobile");
+                    String dMobile = passenger.getStr("mobile");
                     //出行人证件号，可空，实名制产品必传
                     visitor.setCredentialNo(passenger.getStr("cardNo"));
                     // 出行人证件类型，默认身份证，具体定义参见附录4.2
@@ -703,7 +642,7 @@ public class XieChengServiceImpl implements XieChengService, OtaService {
                 return xieChengReturn("0000", "该订单已全部退款", distributor, res_body);
             }
             int checkCount = MapUtil.getInt(ticketMap, "checkCount");
-            int partCount = MapUtil.getInt(ticketMap, "partCount",0);
+            int partCount = MapUtil.getInt(ticketMap, "partCount", 0);
             int outTimeCount = MapUtil.getInt(ticketMap, "outTimeCount");
             int useCount = checkCount + partCount + outTimeCount;
             // 订单门票使用数量 == 总数量
@@ -818,8 +757,8 @@ public class XieChengServiceImpl implements XieChengService, OtaService {
                     } else if (refundResult.getCode().equals(REFUND_AUDITING.getCode())) {
                         // 1.取消已确认 2.取消待确认（当confirmType =2时需异步返回确认结果的）
                         res_body.put("supplierConfirmType", 2);
-                    }else {
-                        throw new ServerException(2001,refundResult.getMsg());
+                    } else {
+                        throw new ServerException(2001, refundResult.getMsg());
                     }
                 } else if (Objects.equals(refund.getRefundStatus(), RefundStatusEnum.AUDITING.getStatus())) {
                     res_body.put("supplierConfirmType", 2);
@@ -913,12 +852,12 @@ public class XieChengServiceImpl implements XieChengService, OtaService {
         //解析数据
         int status = 0;
         Integer useCount = MapUtil.getInt(ticketCount, "checkCount", 0) + MapUtil.getInt(ticketCount, "partCount", 0) + MapUtil.getInt(ticketCount, "outTimeCount", 0);
-        Integer cancelCount =  MapUtil.getInt(ticketCount, "refundCount", 0);
+        Integer cancelCount = MapUtil.getInt(ticketCount, "refundCount", 0);
         // 新订单
         if (order.getOrderStatus() == 0) {
             status = 1;
             //已出票
-        } else if (ObjectUtil.equals(order.getOrderStatus() , TradeOrderStatusEnum.UNUSED.getStatus())) {
+        } else if (ObjectUtil.equals(order.getOrderStatus(), TradeOrderStatusEnum.UNUSED.getStatus())) {
             status = 2;
             // 部分取消
             if (cancelCount > 0) {
@@ -928,17 +867,17 @@ public class XieChengServiceImpl implements XieChengService, OtaService {
                 status = 7;
             }
             // 部分取消
-        } else if (ObjectUtil.equals(order.getOrderStatus() , TradeOrderStatusEnum.PARTIAL_REFUND.getStatus())) {
+        } else if (ObjectUtil.equals(order.getOrderStatus(), TradeOrderStatusEnum.PARTIAL_REFUND.getStatus())) {
             status = 4;
             // 全部取消
-        } else if (ObjectUtil.equals(order.getOrderStatus() , TradeOrderStatusEnum.ALL_REFUND.getStatus())) {
+        } else if (ObjectUtil.equals(order.getOrderStatus(), TradeOrderStatusEnum.ALL_REFUND.getStatus())) {
             status = 5;
             // 已验证、已返码
-        } else if (ObjectUtil.equals(order.getOrderStatus() , TradeOrderStatusEnum.PART_CHECK.getStatus())){
+        } else if (ObjectUtil.equals(order.getOrderStatus(), TradeOrderStatusEnum.PART_CHECK.getStatus())) {
             status = 7;
-        } else if ( ObjectUtil.equals(order.getOrderStatus() , TradeOrderStatusEnum.ALL_CHECK.getStatus())) {
+        } else if (ObjectUtil.equals(order.getOrderStatus(), TradeOrderStatusEnum.ALL_CHECK.getStatus())) {
             status = 8;
-        } else if (ObjectUtil.equals(order.getOrderStatus() , TradeOrderStatusEnum.EXPIRED.getStatus())) {
+        } else if (ObjectUtil.equals(order.getOrderStatus(), TradeOrderStatusEnum.EXPIRED.getStatus())) {
             status = 10;
         }
         String sequenceId = body.getStr("sequenceId");
@@ -997,7 +936,7 @@ public class XieChengServiceImpl implements XieChengService, OtaService {
                         passenger.put("passengerStatus", 1);
                         voucher.put("voucherStatus", 1);
                     } else if (tradeDetailDO.getVoucherStatus().equals(VoucherStatusEnum.REFUNDING.getStatus())
-                            || ObjectUtil.equals(tradeDetailDO.getVoucherStatus(),VoucherStatusEnum.PART_REFUND.getStatus())
+                            || ObjectUtil.equals(tradeDetailDO.getVoucherStatus(), VoucherStatusEnum.PART_REFUND.getStatus())
                             || tradeDetailDO.getVoucherStatus().equals(VoucherStatusEnum.REFUND.getStatus())) {
                         passenger.put("passengerStatus", 2);
                         voucher.put("voucherStatus", 2);
@@ -1034,13 +973,13 @@ public class XieChengServiceImpl implements XieChengService, OtaService {
      */
     @Override
     public boolean consumeNotice(DistributorRespDTO distributor, Map<String, Object> map) {
-        String orderNo =MapUtil.getStr(map, "orderNo");
+        String orderNo = MapUtil.getStr(map, "orderNo");
         Long orderId = MapUtil.getLong(map, "orderId");
 
 
         Map<String, Object> ticketMap = tradeOrderRepositoryService.queryDetailCountByOrderId(orderId);
         int checkCount = MapUtil.getInt(ticketMap, "checkCount");
-        int partCount = MapUtil.getInt(ticketMap, "partCount",0);
+        int partCount = MapUtil.getInt(ticketMap, "partCount", 0);
         int outTimeCount = MapUtil.getInt(ticketMap, "outTimeCount");
         int useCount = checkCount + partCount + outTimeCount;
         String sendUrl = "";
@@ -1052,15 +991,15 @@ public class XieChengServiceImpl implements XieChengService, OtaService {
             //已入园
             //返回数据
             JSONObject res_body = new JSONObject();
-            res_body.put("otaOrderId",MapUtil.getStr(map, "external_order_no"));
-            res_body.put("supplierOrderId",MapUtil.getStr(map, "orderNo"));
+            res_body.put("otaOrderId", MapUtil.getStr(map, "external_order_no"));
+            res_body.put("supplierOrderId", MapUtil.getStr(map, "orderNo"));
             res_body.put("sequenceId", new SimpleDateFormat("yyyyMMdd").format(new Date()) + UUID.randomUUID().toString().replace("-", ""));
             JSONArray items = new JSONArray();
             JSONObject item = new JSONObject();
             item.put("itemId", MapUtil.getStr(map, "item_id"));
             SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
-            String useStartDate = DateUtil.format(MapUtil.getDate(map, "ticketStartDate"),DatePattern.NORM_DATE_PATTERN);
-            String useEndDate = DateUtil.format(MapUtil.getDate(map, "ticketEndDate"),DatePattern.NORM_DATE_PATTERN);
+            String useStartDate = DateUtil.format(MapUtil.getDate(map, "ticketStartDate"), DatePattern.NORM_DATE_PATTERN);
+            String useEndDate = DateUtil.format(MapUtil.getDate(map, "ticketEndDate"), DatePattern.NORM_DATE_PATTERN);
             item.put("useStartDate", useStartDate);
             item.put("useEndDate", useEndDate);
             item.put("quantity", totalTicket);
@@ -1098,7 +1037,7 @@ public class XieChengServiceImpl implements XieChengService, OtaService {
             item.put("remark", "");
             items.add(item);
             res_body.put("items", items);
-            res_body.put("itemId",MapUtil.getStr(map, "item_id"));
+            res_body.put("itemId", MapUtil.getStr(map, "item_id"));
             //String json = res_body.toJSONString();
             // 发送请求
             Map<String, String> headMap = new HashMap<String, String>(0);
@@ -1167,7 +1106,7 @@ public class XieChengServiceImpl implements XieChengService, OtaService {
     }
 
     /**
-     * @param map       参数
+     * @param map 参数
      * @return boolean
      * @description 退票结果异步通知携程
      * @author 杨涛
@@ -1178,7 +1117,7 @@ public class XieChengServiceImpl implements XieChengService, OtaService {
         String sendUrl = "";
         String param = "";
         String orderNo = MapUtil.getStr(map, "order_no");
-        String refundNo =MapUtil.getStr(map, "refund_id");
+        String refundNo = MapUtil.getStr(map, "refund_id");
         map.put("pid", orderNo);
         map.put("ticket_no", refundNo);
         try {
@@ -1187,12 +1126,12 @@ public class XieChengServiceImpl implements XieChengService, OtaService {
             // 携程处理批次流水号
             resBody.put("sequenceId", refundNo);
             // 携程订单号
-            resBody.put("otaOrderId",MapUtil.getStr(map, "external_order_no"));
+            resBody.put("otaOrderId", MapUtil.getStr(map, "external_order_no"));
             // 供应商订单号
             resBody.put("supplierOrderId", orderNo);
 
             // 审核状态：0待审核，1审核通过，2审核驳回
-            String auditStatus =MapUtil.getStr(map, "audit_status");
+            String auditStatus = MapUtil.getStr(map, "audit_status");
             boolean auditStatusFlag = StrUtil.equals(auditStatus, "1");
             boolean auditSatausRejectFlag = StrUtil.equals(auditStatus, "0");
             if (auditStatusFlag) {
@@ -1204,12 +1143,12 @@ public class XieChengServiceImpl implements XieChengService, OtaService {
                 // 确认结果返回码 0000表示成功 0005 系统处理异常拒绝
                 resBody.put("confirmResultCode", "0005");
                 // 确认信息
-                resBody.put("confirmResultMessage",MapUtil.getStr(map, "remark"));
+                resBody.put("confirmResultMessage", MapUtil.getStr(map, "remark"));
             }
 
             JSONArray items = new JSONArray();
             JSONObject item = new JSONObject();
-            item.put("itemId",MapUtil.getStr(map, "item_id"));
+            item.put("itemId", MapUtil.getStr(map, "item_id"));
             items.add(item);
             resBody.put("items", items);
 
@@ -1338,25 +1277,32 @@ public class XieChengServiceImpl implements XieChengService, OtaService {
                 certificateType = CredentialTypeEnum.PASSPORT.getType();
                 break;
             case "7":
-                certificateType = CredentialTypeEnum.HUI_XIANG_CARD.getType(); ;
+                certificateType = CredentialTypeEnum.HUI_XIANG_CARD.getType();
+                ;
                 break;
             case "8":
-                certificateType = CredentialTypeEnum.TAI_BAO_CARD.getType(); ;
+                certificateType = CredentialTypeEnum.TAI_BAO_CARD.getType();
+                ;
                 break;
             case "10":
-                certificateType = CredentialTypeEnum.GANG_AO_PASS_CARD.getType(); ;
+                certificateType = CredentialTypeEnum.GANG_AO_PASS_CARD.getType();
+                ;
                 break;
             case "20":
-                certificateType = CredentialTypeEnum.FORERVER_LIVE_CARD.getType(); ;
+                certificateType = CredentialTypeEnum.FORERVER_LIVE_CARD.getType();
+                ;
                 break;
             case "22":
-                certificateType = CredentialTypeEnum.TW_PASS_CARD.getType(); ;
+                certificateType = CredentialTypeEnum.TW_PASS_CARD.getType();
+                ;
                 break;
             case "32":
-                certificateType = CredentialTypeEnum.GAT_PASS_CARD.getType(); ;
+                certificateType = CredentialTypeEnum.GAT_PASS_CARD.getType();
+                ;
                 break;
             default:
-                certificateType = CredentialTypeEnum.OTHER.getType(); ;
+                certificateType = CredentialTypeEnum.OTHER.getType();
+                ;
                 break;
         }
 

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

@@ -11,8 +11,8 @@ import java.util.List;
 
 /**
  * @Description 旅行社订单交易service接口
- * @Author qsl
  * @Date 2025/8/12 08:34
+ * @author qsl
  */
 public interface AppOtaTradeOrderService {
 

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

@@ -12,7 +12,7 @@ import java.util.List;
 
 /**
  * @Description 旅行社订单交易service接口
- * @Author qsl
+ * @author qsl
  * @Date 2025/8/12 08:34
  */
 public interface AppTradeOrderService {
@@ -20,16 +20,12 @@ public interface AppTradeOrderService {
     /**
      * 小程序订单查询
      *
-     * @param reqVO
-     * @return
      */
     CommonResult<List<AppTradeOrderRespVO>> miniTradeOrderPage(AppTradeOrderReqVO.TradeOrderQueryReqVO reqVO);
 
     /**
      * 小程序订单关联订单查询
      *
-     * @param id
-     * @return
      */
     CommonResult<AppTradeOrderRespVO> miniOrderInfoById(Long id);
 

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

@@ -6,29 +6,9 @@ import com.yc.ship.framework.common.pojo.PageResult;
 import com.yc.ship.framework.security.core.LoginUser;
 import com.yc.ship.module.product.api.dto.CategoryRespDTO;
 import com.yc.ship.module.product.api.dto.ProductSpuRespDTO;
-import com.yc.ship.module.trade.controller.admin.order.vo.order.OrderPayAmountRespVO;
-import com.yc.ship.module.trade.controller.admin.order.vo.order.OtcTradeChangeOrderReqVO;
-import com.yc.ship.module.trade.controller.admin.order.vo.order.OtcTradeOrderChangeReqVO;
-import com.yc.ship.module.trade.controller.admin.order.vo.order.OtcTradeOrderCreateReqVO;
-import com.yc.ship.module.trade.controller.admin.order.vo.order.OtcTradeOrderCreateRespVO;
-import com.yc.ship.module.trade.controller.admin.order.vo.order.PayOrderReqVO;
-import com.yc.ship.module.trade.controller.admin.order.vo.order.PayOrderRespVO;
-import com.yc.ship.module.trade.controller.admin.order.vo.order.ShipTradeOrderCreateReqVO;
-import com.yc.ship.module.trade.controller.admin.order.vo.order.TradeDetailPageReqVO;
-import com.yc.ship.module.trade.controller.admin.order.vo.order.TradeDetailRespVO;
-import com.yc.ship.module.trade.controller.admin.order.vo.order.TradeOrderConfirmationVO;
-import com.yc.ship.module.trade.controller.admin.order.vo.order.TradeOrderOtcCreateVO;
-import com.yc.ship.module.trade.controller.admin.order.vo.order.TradeOrderPageReqVO;
-import com.yc.ship.module.trade.controller.admin.order.vo.order.TradeOrderPdaRespVO;
-import com.yc.ship.module.trade.controller.admin.order.vo.order.TradeOrderRespNewVO;
-import com.yc.ship.module.trade.controller.admin.order.vo.order.TradeOrderRespVO;
-import com.yc.ship.module.trade.controller.admin.order.vo.order.TradeStaticReqVO;
+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.RefundDetailRespVO;
-import com.yc.ship.module.trade.controller.admin.order.vo.refund.RefundPageReqVO;
-import com.yc.ship.module.trade.controller.admin.order.vo.refund.RefundRecordPageReqVO;
-import com.yc.ship.module.trade.controller.admin.order.vo.refund.RefundRecordRespVO;
-import com.yc.ship.module.trade.controller.admin.order.vo.refund.RefundRespVO;
+import com.yc.ship.module.trade.controller.admin.order.vo.refund.*;
 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;
@@ -43,33 +23,12 @@ public interface OtcTradeOrderService {
 
     String KEY_MARK_CHANGE_ORDER = "changeOrder:confirm:key:%d";
 
-    /**
-     * 窗口订单创建
-     */
-    CommonResult<OtcTradeOrderCreateRespVO> windowCreateOrder(LoginUser loginUser, OtcTradeOrderCreateReqVO otcTradeOrderCreateReqVO);
-
-    CommonResult<OtcTradeOrderCreateRespVO> platCreateMoveOrder(LoginUser loginUser, ShipTradeOrderCreateReqVO otcTradeOrderCreateReqVO);
 
     /**
      * 窗口支付订单
      */
     CommonResult<PayOrderRespVO> windowPayOrder(LoginUser loginUser, PayOrderReqVO payOrderReqVO);
 
-    /**
-     * 订单改签
-     */
-    CommonResult<OtcTradeOrderCreateRespVO> changeOrder(LoginUser loginUser, OtcTradeOrderChangeReqVO otcTradeOrderChangeReqVO);
-
-    /**
-     * 订单门票改签 ，暂时未启用，要用需检查
-     */
-    CommonResult<OtcTradeOrderCreateRespVO> changeTicket(LoginUser loginUser, OtcTradeOrderChangeReqVO otcTradeOrderChangeReqVO);
-
-    /**
-     * 订单改签确认
-     */
-    CommonResult<?> confirmChangeOrder(LoginUser loginUser, OtcTradeChangeOrderReqVO otcTradeChangeOrderReqVO);
-
     /**
      * 查询订单状态
      */
@@ -107,8 +66,6 @@ public interface OtcTradeOrderService {
 
     List<CategoryRespDTO> getCategoryAndSpuAll(String type, String travelDate);
 
-    List<CategoryRespDTO> getCategoryAndSpuAllOuterOtc(Long distributorId, String travelDate);
-
     ProductSpuRespDTO getProductSpuDTO(Long id, String date, String planId);
 
     ProductSpuRespDTO getProductSpuDTO(Long id, String date, String planId, Long distributorId);
@@ -170,8 +127,6 @@ public interface OtcTradeOrderService {
 
     /**
      * 生成确认单
-     * @param id
-     * @return
      */
     File createConfirmaction(Long id, Double totalMoney);
 }

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

@@ -1,92 +1,26 @@
 package com.yc.ship.module.trade.service.otc.impl;
 
-import cn.hutool.core.map.MapUtil;
-import cn.hutool.extra.spring.SpringUtil;
-import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.yc.ship.framework.common.pojo.CommonResult;
-import com.yc.ship.framework.common.util.object.BeanUtils;
-import com.yc.ship.framework.security.core.LoginUser;
-import com.yc.ship.framework.tenant.core.aop.TenantIgnore;
-import com.yc.ship.framework.tenant.core.context.TenantContextHolder;
-import com.yc.ship.framework.tenant.core.util.TenantUtils;
-import com.yc.ship.module.ota.api.OtaDistributorApi;
-import com.yc.ship.module.ota.api.dto.DistributorRespDTO;
-import com.yc.ship.module.product.api.ProductApi;
-import com.yc.ship.module.product.api.dto.ProductBaseRespDTO;
-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.controller.admin.order.vo.order.TradeDetailRespVO;
-import com.yc.ship.module.trade.controller.admin.order.vo.order.TradeOrderLogRespVO;
-import com.yc.ship.module.trade.controller.admin.order.vo.order.TradeOrderRespVO;
 import com.yc.ship.module.trade.controller.app.otc.vo.AppTradeOrderReqVO;
 import com.yc.ship.module.trade.controller.app.otc.vo.AppTradeOrderRespVO;
-import com.yc.ship.module.trade.dal.dataobject.order.TradeDetailBaseDO;
-import com.yc.ship.module.trade.dal.dataobject.order.TradeDetailDO;
-import com.yc.ship.module.trade.dal.dataobject.order.TradeOrderDO;
-import com.yc.ship.module.trade.dal.dataobject.order.TradeOrderLogDO;
-import com.yc.ship.module.trade.dal.mysql.order.TradeDetailBaseMapper;
-import com.yc.ship.module.trade.dal.mysql.order.TradeDetailMapper;
-import com.yc.ship.module.trade.dal.mysql.order.TradeOrderLogMapper;
-import com.yc.ship.module.trade.dal.mysql.order.TradeOrderMapper;
-import com.yc.ship.module.trade.enums.TradeOrderOperateTypeEnum;
-import com.yc.ship.module.trade.framework.annotation.TradeOrderLog;
-import com.yc.ship.module.trade.framework.common.TradeOrderLogUtils;
-import com.yc.ship.module.trade.service.order.TradeOrderQueryService;
-import com.yc.ship.module.trade.service.order.TradeOrderService;
 import com.yc.ship.module.trade.service.otc.AppOtaTradeOrderService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
-import javax.annotation.Resource;
-import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.stream.Collectors;
-
-import static com.yc.ship.framework.common.exception.util.ServiceExceptionUtil.exception0;
-import static com.yc.ship.framework.security.core.util.SecurityFrameworkUtils.getLoginUser;
 
 
 /**
  * @Description 旅行社订单交易service实现
- * @Author qsl
  * @Date 2025/8/12 08:34
+ * @author qsl
  */
 @Service
 @Slf4j
 public class AppOtaTradeOrderServiceImpl implements AppOtaTradeOrderService {
 
-    @Resource
-    private TradeOrderService tradeOrderService;
-    @Resource
-    private TradeOrderMapper tradeOrderMapper;
-    @Resource
-    private TradeDetailMapper tradeDetailMapper;
-    @Resource
-    private TradeOrderLogMapper tradeOrderLogMapper;
-    @Resource
-    private TradeDetailBaseMapper tradeDetailBaseMapper;
-    @Resource
-    private TradeOrderQueryService tradeOrderQueryService;
-    @Resource
-    private OtaDistributorApi otaDistributorApi;
-    @Resource
-    private AdminUserApi adminUserApi;
-    @Resource
-    private ProductApi productApi;
-
-
 
 
-
-    private AppOtaTradeOrderServiceImpl getSelf() {
-        return SpringUtil.getBean(getClass());
-    }
-
     @Override
     public CommonResult<List<AppTradeOrderRespVO>> getOtaOrderList(AppTradeOrderReqVO.TradeOrderQueryReqVO reqVO) {
         return null;

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

@@ -16,8 +16,6 @@ import com.yc.ship.module.trade.controller.app.otc.vo.AppTradeOrderRespVO;
 import com.yc.ship.module.trade.convert.order.TradeOrderConvert;
 import com.yc.ship.module.trade.dal.dataobject.order.TradeOrderRoomModelDO;
 import com.yc.ship.module.trade.dal.dataobject.order.TradeOrderTotalDO;
-import com.yc.ship.module.trade.dal.mysql.order.TradeOrderCountryMapper;
-import com.yc.ship.module.trade.dal.mysql.order.TradeOrderFloorMapper;
 import com.yc.ship.module.trade.dal.mysql.order.TradeOrderRoomModelMapper;
 import com.yc.ship.module.trade.dal.mysql.order.TradeOrderTotalMapper;
 import com.yc.ship.module.trade.enums.PayAccountTypeEnum;
@@ -64,14 +62,8 @@ public class AppOtcTradeOrderServiceImpl implements AppOtcTradeOrderService {
 
     @Resource
     private TradeOrderTotalMapper tradeOrderTotalMapper;
-
-    @Resource
-    private TradeOrderCountryMapper tradeOrderCountryMapper;
-
     @Resource
     private TradeOrderRoomModelMapper tradeOrderRoomModelMapper;
-    @Resource
-    private TradeOrderFloorMapper tradeOrderFloorMapper;
 
 
     @Override

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

@@ -2,13 +2,11 @@ package com.yc.ship.module.trade.service.otc.impl;
 
 import com.yc.ship.framework.common.lang.Asserts;
 import com.yc.ship.framework.common.pojo.CommonResult;
-import com.yc.ship.framework.common.util.collection.CollectionUtils;
 import com.yc.ship.framework.common.util.object.BeanUtils;
 import com.yc.ship.framework.tenant.core.context.TenantContextHolder;
 import com.yc.ship.framework.tenant.core.util.TenantUtils;
 import com.yc.ship.module.ota.api.OtaDistributorApi;
 import com.yc.ship.module.ota.api.dto.DistributorRespDTO;
-import com.yc.ship.module.product.api.dto.ProductSpuRespDTO;
 import com.yc.ship.module.system.api.dict.DictDataApi;
 import com.yc.ship.module.system.api.dict.dto.DictDataRespDTO;
 import com.yc.ship.module.trade.controller.admin.order.vo.order.TradeDetailRespVO;
@@ -22,14 +20,14 @@ import com.yc.ship.module.trade.enums.TradeOrderOperateTypeEnum;
 import com.yc.ship.module.trade.service.order.TradeOrderQueryService;
 import com.yc.ship.module.trade.service.otc.AppTradeOrderService;
 import com.yc.ship.module.trade.service.otc.OtcTradeOrderService;
-import com.yc.ship.module.trade.service.supplier.TradeSupplierOrderRepositoryService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.List;
+import java.util.Objects;
+import java.util.StringJoiner;
 import java.util.stream.Collectors;
 
 import static com.yc.ship.framework.common.exception.util.ServiceExceptionUtil.exception0;
@@ -37,8 +35,8 @@ import static com.yc.ship.framework.common.exception.util.ServiceExceptionUtil.e
 
 /**
  * @Description 旅行社订单交易service实现
- * @Author qsl
  * @Date 2025/8/12 08:34
+ * @author qsl
  */
 @Service
 @Slf4j
@@ -51,8 +49,6 @@ public class AppTradeOrderServiceImpl implements AppTradeOrderService {
     @Resource
     private TradeOrderQueryService tradeOrderQueryService;
     @Resource
-    private TradeSupplierOrderRepositoryService tradeSupplierOrderRepositoryService;
-    @Resource
     private TradeDetailMapper tradeDetailMapper;
     @Resource
     private TradeOrderLogMapper tradeOrderLogMapper;
@@ -75,8 +71,8 @@ public class AppTradeOrderServiceImpl implements AppTradeOrderService {
             orderStatus.add(10);
             orderStatus.add(13);
             CommonResult<List<TradeOrderRespVO>> result = tradeOrderQueryService.orderList(tenantId, reqVO.getOrderStatus(), reqVO.getTravelDate(), reqVO.getCredentialNo(), reqVO.getMobile());
-            List<AppTradeOrderRespVO> respVOS = BeanUtils.toBean(result.getCheckedData(), AppTradeOrderRespVO.class);
-            respVOS.forEach(spu -> {
+            List<AppTradeOrderRespVO> respList = BeanUtils.toBean(result.getCheckedData(), AppTradeOrderRespVO.class);
+            respList.forEach(spu -> {
                 TenantUtils.execute(tenantId, () -> {
                     //获取规格数量
                     List<TradeDetailRespVO> list = tradeDetailMapper.getOrderDetail(spu.getId());
@@ -88,16 +84,16 @@ public class AppTradeOrderServiceImpl implements AppTradeOrderService {
                         if (count > 0) {
                             joiner.add(dict.getLabel() + "*" + count);
                         }
-                        totalNum+=count;
+                        totalNum+= (int) count;
                     }
                     spu.setSpecNumber(joiner.toString());
                     spu.setNum(totalNum);
 
                     spu.setIsPerfect(0);
                     // 获取订单操作记录
-                    List<TradeOrderLogDO> tradeOrderLogDOS = tradeOrderLogMapper.selectList(TradeOrderLogDO::getOrderId, spu.getId());
-                    tradeOrderLogDOS = tradeOrderLogDOS.stream().filter(tradeOrderLogDO -> Objects.equals(tradeOrderLogDO.getOperateType(), TradeOrderOperateTypeEnum.ORDER_PERFECT.getType())).collect(Collectors.toList());
-                    if (!tradeOrderLogDOS.isEmpty()) {
+                    List<TradeOrderLogDO> tradeOrderLogList = tradeOrderLogMapper.selectList(TradeOrderLogDO::getOrderId, spu.getId());
+                    tradeOrderLogList = tradeOrderLogList.stream().filter(tradeOrderLogDO -> Objects.equals(tradeOrderLogDO.getOperateType(), TradeOrderOperateTypeEnum.ORDER_PERFECT.getType())).collect(Collectors.toList());
+                    if (!tradeOrderLogList.isEmpty()) {
                         spu.setIsPerfect(1);
                     }
                     if (!list.isEmpty()) {
@@ -105,7 +101,7 @@ public class AppTradeOrderServiceImpl implements AppTradeOrderService {
                     }
                 });
             });
-            return CommonResult.success(respVOS);
+            return CommonResult.success(respList);
         }
         return CommonResult.error(30_100, "未找到平台信息");
     }

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

@@ -5,7 +5,6 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.hutool.extra.spring.SpringUtil;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.EasyExcelFactory;
 import com.alibaba.excel.ExcelWriter;
@@ -31,6 +30,7 @@ import com.yc.ship.framework.common.util.collection.CollectionUtils;
 import com.yc.ship.framework.common.util.object.BeanUtils;
 import com.yc.ship.framework.common.util.object.ObjectUtils;
 import com.yc.ship.framework.ip.core.utils.AreaUtils;
+import com.yc.ship.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.yc.ship.framework.security.core.LoginUser;
 import com.yc.ship.framework.security.core.util.SecurityFrameworkUtils;
 import com.yc.ship.framework.tenant.core.aop.TenantIgnore;
@@ -40,9 +40,6 @@ 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.user.MemberUserApi;
 import com.yc.ship.module.member.api.user.dto.MemberUserRespDTO;
-import com.yc.ship.module.ota.api.OtaDistributorApi;
-import com.yc.ship.module.ota.api.dto.DistributorProductRespDTO;
-import com.yc.ship.module.ota.api.dto.DistributorRespDTO;
 import com.yc.ship.module.ota.dal.dataobject.distributor.DistributorDO;
 import com.yc.ship.module.ota.dal.mysql.distributor.DistributorMapper;
 import com.yc.ship.module.otc.api.agency.dto.AgencyUserLoginInfoRespDTO;
@@ -72,6 +69,7 @@ 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.convert.order.TradeOrderConvert;
+import com.yc.ship.module.trade.dal.dataobject.audituser.AuditUserDO;
 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.invoice.InvoiceDO;
@@ -103,8 +101,6 @@ import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.poi.ss.util.RegionUtil;
 import org.jetbrains.annotations.NotNull;
-import org.redisson.api.RLock;
-import org.redisson.api.RedissonClient;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -125,9 +121,6 @@ import static com.yc.ship.framework.security.core.util.SecurityFrameworkUtils.ge
 import static com.yc.ship.framework.security.core.util.SecurityFrameworkUtils.getLoginUserNickname;
 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.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;
 
 
 /**
@@ -157,8 +150,6 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
     @Resource
     private MemberUserApi memberUserApi;
     @Resource
-    private OtaDistributorApi otaDistributorApi;
-    @Resource
     private MemberAddressApi memberAddressApi;
 
     @Resource
@@ -194,8 +185,6 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
     private StringRedisTemplate stringRedisTemplate;
     @Resource
     private TradeOrderDeliveryMapper tradeOrderDeliveryMapper;
-    @Resource
-    private RedissonClient redissonClient;
 
     @Resource
     private AgencyAuthUtils agencyAuthUtils;
@@ -240,78 +229,6 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
     public final static String AGENCY_LOGIN_INFO = "agencyLoginInfo";
 
 
-    @Override
-    public CommonResult<OtcTradeOrderCreateRespVO> windowCreateOrder(LoginUser loginUser, OtcTradeOrderCreateReqVO otcTradeOrderCreateReqVO) {
-
-        CommonResult<TradeOrderRespDTO> result = doWindowCreateOrder(loginUser, otcTradeOrderCreateReqVO, SellMethodEnum.WINDOW);
-        if (result.isError()) {
-            return CommonResult.error(result);
-        }
-        OtcTradeOrderCreateRespVO respVO = TradeOrderConvert.INSTANCE.convert(result.getData());
-        //是否为关联订单
-        if (otcTradeOrderCreateReqVO.getMainOrderId() != null) {
-            SpringUtil.getBean(OtcTradeOrderServiceImpl.class).addOrder(respVO, otcTradeOrderCreateReqVO.getMainOrderId());
-        }
-
-        return CommonResult.success(respVO);
-    }
-
-    @Override
-    public CommonResult<OtcTradeOrderCreateRespVO> platCreateMoveOrder(LoginUser loginUser, ShipTradeOrderCreateReqVO shipTradeOrderCreateReqVO) {
-        if (loginUser.getDistributorId() != null) {
-            shipTradeOrderCreateReqVO.setDistributorId(loginUser.getDistributorId());
-        }
-        Asserts.isTrue(shipTradeOrderCreateReqVO.getDistributorId() != null, "分销商ID不能为空");
-        OtcTradeOrderCreateReqVO otcTradeOrderCreateReqVO = TradeOrderConvert.INSTANCE.convert(shipTradeOrderCreateReqVO);
-        //获取当前分销商信息
-        DistributorDO distributorDto = distributorMapper.selectById(otcTradeOrderCreateReqVO.getDistributorId());
-
-        //平台产品
-        for (TradeOrderCreateReqDTO.OrderItem orderItem : otcTradeOrderCreateReqVO.getItemlList()) {
-            DistributorProductRespDTO distributorProductRespDTO = otaDistributorApi.getDistributorProductById(Long.parseLong(orderItem.getProductId())).getCheckedData();
-            orderItem.setProductId(distributorProductRespDTO.getProductId().toString());
-            orderItem.setProductType(PRODUCT_BASE_TYPE_SELF);
-            for (TradeOrderCreateReqDTO.OrderDetail orderDetail : orderItem.getDetailList()) {
-                orderDetail.setProductId(orderItem.getProductId());
-                orderDetail.setProductType(orderItem.getProductType());
-            }
-        }
-        otcTradeOrderCreateReqVO.getOrderProperty().setSourceId(distributorDto.getId().toString());
-        otcTradeOrderCreateReqVO.getOrderProperty().setSourceName(distributorDto.getName());
-        CommonResult<TradeOrderRespDTO> result = doWindowCreateOrder(loginUser, otcTradeOrderCreateReqVO, SellMethodEnum.OTC_MOVE_ORDER);
-        if (result.isError()) {
-            return CommonResult.error(result);
-        }
-        OtcTradeOrderCreateRespVO respVO = TradeOrderConvert.INSTANCE.convert(result.getData());
-        //是否为关联订单
-        if (otcTradeOrderCreateReqVO.getMainOrderId() != null) {
-            SpringUtil.getBean(OtcTradeOrderServiceImpl.class).addOrder(respVO, otcTradeOrderCreateReqVO.getMainOrderId());
-        }
-
-        return CommonResult.success(respVO);
-    }
-
-    private CommonResult<TradeOrderRespDTO> doWindowCreateOrder(LoginUser loginUser, OtcTradeOrderCreateReqVO otcTradeOrderCreateReqVO, SellMethodEnum sellMethodEnum) {
-        TradeOrderCreateReqDTO reqDTO = TradeOrderConvert.INSTANCE.convert(otcTradeOrderCreateReqVO);
-        TradeOrderCreateReqDTO.OrderProperty orderProperty = reqDTO.getOrderProperty();
-        if (orderProperty == null) {
-            orderProperty = new TradeOrderCreateReqDTO.OrderProperty();
-        }
-        orderProperty.setSellMethod(sellMethodEnum.getType());
-        //补票销售渠道
-        if (otcTradeOrderCreateReqVO.getIsTimePay() != null && otcTradeOrderCreateReqVO.getIsTimePay() == 1) {
-            orderProperty.setSellMethod(SellMethodEnum.OTC_TIMEPAY_ORDER.getType());
-        }
-        //增加订单
-        if (otcTradeOrderCreateReqVO.getMainOrderId() != null) {
-            reqDTO.setIsAddOrder(YES);
-        }
-
-        setOrderPropertyFromLoginUser(loginUser, orderProperty, sellMethodEnum);
-        reqDTO.setOrderProperty(orderProperty);
-        return tradeOrderService.createOrder(reqDTO);
-    }
-
     private CommonResult<TradeOrderRespDTO> doShipCreateOrder(LoginUser loginUser, ShipTradeOrderCreateReqVO otcTradeOrderCreateReqVO) {
         try {
             ShipTradeOrderCreateReqVO.OrderProperty orderProperty = otcTradeOrderCreateReqVO.getOrderProperty();
@@ -360,135 +277,6 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
     }
 
 
-    /**
-     * 订单门票改签 ，暂时未启用，要用需检查
-     */
-    @Override
-    public CommonResult<OtcTradeOrderCreateRespVO> changeTicket(LoginUser loginUser, OtcTradeOrderChangeReqVO otcTradeOrderChangeReqVO) {
-        Asserts.isTrue(CollUtil.isNotEmpty(otcTradeOrderChangeReqVO.getOriginDetailIdList()), "改签明细ID不能为空");
-        Asserts.isTrue(otcTradeOrderChangeReqVO.getMainOrderId() != null, "mainOrderId不能为空");
-        TradeOrderDO tradeOrderDO = tradeOrderRepositoryService.getById(otcTradeOrderChangeReqVO.getMainOrderId());
-
-        TradeOrderCreateReqDTO.OrderProperty orderProperty = otcTradeOrderChangeReqVO.getOrderProperty();
-        if (orderProperty == null) {
-            orderProperty = new TradeOrderCreateReqDTO.OrderProperty();
-        }
-        //后面有判断更改销售渠道
-        orderProperty.setSellMethod(tradeOrderDO.getSellMethod());
-        setOrderPropertyFromLoginUser(loginUser, orderProperty, SellMethodEnum.valueOf(orderProperty.getSellMethod()));
-        otcTradeOrderChangeReqVO.setOrderProperty(orderProperty);
-        TradeOrderChangeRespDTO respData = tradeOrderService.changeTicket(otcTradeOrderChangeReqVO, tradeOrderDO).getCheckedData();
-        return CommonResult.success(BeanUtils.toBean(respData, OtcTradeOrderCreateRespVO.class));
-    }
-
-    /**
-     * 订单变更规格，退原订单，新建订单。库存保留
-     */
-    @Override
-    public CommonResult<OtcTradeOrderCreateRespVO> changeOrder(LoginUser loginUser, OtcTradeOrderChangeReqVO otcTradeOrderChangeReqVO) {
-        Asserts.isTrue(otcTradeOrderChangeReqVO.getMainOrderId() != null, "mainOrderId不能为空");
-        TradeOrderDO tradeOrderDO = tradeOrderRepositoryService.getById(otcTradeOrderChangeReqVO.getMainOrderId());
-        DistributorRespDTO distributorRespDTO = agencyAuthUtils.getLoginUserDistributorData();
-        if (distributorRespDTO != null) {
-            Asserts.isTrue(ObjectUtil.equal(distributorRespDTO.getId().toString(), tradeOrderDO.getSourceId()), "当前账号无该数据权限");
-        }
-
-        TradeOrderCreateReqDTO.OrderProperty orderProperty = otcTradeOrderChangeReqVO.getOrderProperty();
-        if (orderProperty == null) {
-            orderProperty = new TradeOrderCreateReqDTO.OrderProperty();
-        }
-        //后面有判断更改销售渠道
-        orderProperty.setSellMethod(tradeOrderDO.getSellMethod());
-        setOrderPropertyFromLoginUser(loginUser, orderProperty, SellMethodEnum.valueOf(orderProperty.getSellMethod()));
-        otcTradeOrderChangeReqVO.setOrderProperty(orderProperty);
-
-        if (ThreadLocalUtil.getAgencyId() != null) {
-            //平台产品
-            for (TradeOrderCreateReqDTO.OrderItem orderItem : otcTradeOrderChangeReqVO.getItemlList()) {
-                DistributorProductRespDTO distributorProductRespDTO = otaDistributorApi.getDistributorProductById(Long.parseLong(orderItem.getProductId())).getCheckedData();
-                orderItem.setProductId(distributorProductRespDTO.getProductId().toString());
-                orderItem.setProductType(PRODUCT_BASE_TYPE_SELF);
-                for (TradeOrderCreateReqDTO.OrderDetail orderDetail : orderItem.getDetailList()) {
-                    orderDetail.setProductId(orderItem.getProductId());
-                    orderDetail.setProductType(orderItem.getProductType());
-                }
-            }
-            otcTradeOrderChangeReqVO.getOrderProperty().setSourceId(tradeOrderDO.getSourceId());
-            otcTradeOrderChangeReqVO.getOrderProperty().setSourceName(tradeOrderDO.getSourceName());
-        }
-
-        TradeOrderChangeRespDTO respData = tradeOrderService.changeOrder(otcTradeOrderChangeReqVO, tradeOrderDO).getCheckedData();
-        return CommonResult.success(BeanUtils.toBean(respData, OtcTradeOrderCreateRespVO.class));
-    }
-
-
-    /**
-     * 订单改签确认,
-     */
-    @TradeOrderLog(operateType = TradeOrderOperateTypeEnum.ORDER_CHANGE_CONFIRM)
-    @Override
-    public CommonResult<?> confirmChangeOrder(LoginUser loginUser, OtcTradeChangeOrderReqVO otcTradeChangeOrderReqVO) {
-
-        String lockKey = String.format(CHANGE_ORDER_BIZ_LOCK, otcTradeChangeOrderReqVO.getMainOrderId());
-        RLock lock = redissonClient.getLock(lockKey);
-        try {
-
-            lock.lock();
-            TradeOrderDO tradeOrderDO = tradeOrderRepositoryService.getById(otcTradeChangeOrderReqVO.getMainOrderId());
-            TradeOrderDO newTradeOrderDO = tradeOrderRepositoryService.getById(otcTradeChangeOrderReqVO.getOrderId());
-            List<TradeDetailDO> changeDetailList = tradeOrderRepositoryService.getChangeDetailList(newTradeOrderDO.getId(), tradeOrderDO.getId());
-
-            Asserts.isTrue(ObjectUtils.equalsAny(tradeOrderDO.getOrderStatus(), TradeOrderStatusEnum.UNUSED.getStatus(), TradeOrderStatusEnum.REFUNDING.getStatus()
-                    , TradeOrderStatusEnum.PARTIAL_REFUND.getStatus()), "原订单状态不能改签确认{}", tradeOrderDO.getOrderStatus());
-            //如果新订单都已经取消了也不能继续了
-            Asserts.isTrue(ObjectUtils.equalsAny(newTradeOrderDO.getOrderStatus(), TradeOrderStatusEnum.UNPAID.getStatus()), "新订单状态不能改签确认{}", newTradeOrderDO.getOrderStatus());
-
-            if (CollUtil.isNotEmpty(changeDetailList)) {
-                //窗口可以修改金额,搬单订单不能修改
-                if (ObjectUtils.equalsAny(tradeOrderDO.getSellMethod(), SellMethodEnum.OTC_MOVE_ORDER.getType())) {
-                    BigDecimal changeAmount = changeDetailList.stream().map(TradeDetailDO::getActualPrice).reduce(BigDecimal.ZERO, BigDecimal::add);
-                    BigDecimal subPayAmount = newTradeOrderDO.getPayAmount().subtract(changeAmount);
-                    Asserts.isTrue(subPayAmount.compareTo(otcTradeChangeOrderReqVO.getRealPayAmount()) == 0, "操作金额不匹配{}", subPayAmount);
-                }
-            } else {
-                BigDecimal subPayAmount = newTradeOrderDO.getPayAmount().subtract(tradeOrderDO.getPayAmount());
-                if (ObjectUtil.equal(tradeOrderDO.getOrderStatus(), TradeOrderStatusEnum.PARTIAL_REFUND.getStatus())) {
-                    //如果改签订单有退款，扣除退款金额
-                    BigDecimal orderRefundAmount = tradeRefundRepositoryService.getOrderOriginRefundAmount(tradeOrderDO.getId());
-                    subPayAmount = subPayAmount.add(orderRefundAmount);
-                    //防止有特殊情况造成核销的订单也申请了
-                    Long checkCount = tradeOrderRepositoryService.getCheckCount(tradeOrderDO.getId());
-                    if (checkCount != null && checkCount > 0) {
-                        Asserts.isTrue(false, "原订单已核销不能进行改签");
-                    }
-                    //获取需退门票
-                    changeDetailList = tradeOrderRepositoryService.getUnUsedDetailList(tradeOrderDO.getId());
-                    Long orderDetailCount = tradeOrderRepositoryService.getOrderDetailCount(newTradeOrderDO.getId());
-                    Asserts.isTrue(changeDetailList.size() == orderDetailCount.intValue(), "改签退票数量与新改签订单数量不一致");
-                }
-
-                Asserts.isTrue(subPayAmount.compareTo(otcTradeChangeOrderReqVO.getRealPayAmount()) == 0, "操作金额不匹配{}", subPayAmount);
-            }
-
-            //先退
-            CommonResult<?> refundResult = refundBeforeChangeOrder(loginUser, otcTradeChangeOrderReqVO, tradeOrderDO, newTradeOrderDO, changeDetailList);
-            if (refundResult.isError()) {
-                return refundResult;
-            }
-            //再付
-            CommonResult<?> payResult = payAfterChangeOrder(loginUser, otcTradeChangeOrderReqVO, tradeOrderDO, newTradeOrderDO);
-            //记录订单日志
-            TradeOrderLogUtils.setOrderInfo(tradeOrderDO.getId(), tradeOrderDO.getOrderStatus(), TradeOrderStatusEnum.REFUNDING.getStatus());
-            return payResult;
-
-        } finally {
-            if (lock.isLocked() && lock.isHeldByCurrentThread()) {
-                lock.unlock();
-            }
-        }
-    }
-
-
     private CommonResult<?> refundBeforeChangeOrder(LoginUser loginUser, OtcTradeChangeOrderReqVO otcTradeChangeOrderReqVO, TradeOrderDO tradeOrderDO, TradeOrderDO newTradeOrderDO, List<TradeDetailDO> changeDetailList) {
 
         if (isChangeConfirmed(newTradeOrderDO.getId())) {
@@ -687,24 +475,24 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
             List<TradeOrderDO> tradeOrderDoList = tradeOrderMapper.queryOrderByLast(tradeOrderDO.getOrderNo());
             if (tradeOrderDoList != null && !tradeOrderDoList.isEmpty()) {
                 TradeOrderDO lastTradeOrder = tradeOrderDoList.get(0);
-                tradeOrderMapper.updateOrderDeleted(orderId,1);
-                tradeOrderMapper.updateOrderDeleted(lastTradeOrder.getId(),0);
-                tradeOrderUserMapper.updateDeleted(orderId,1);
-                tradeOrderUserMapper.updateDeleted(lastTradeOrder.getId(),0);
-                tradeDetailMapper.updateDeleted(orderId,1);
-                tradeDetailMapper.updateDeleted(lastTradeOrder.getId(),0);
-                tradeDetailBaseMapper.updateDeleted(orderId,1);
-                tradeDetailBaseMapper.updateDeleted(lastTradeOrder.getId(),0);
-                tradeVisitorMapper.updateDeleted(orderId,1);
-                tradeVisitorMapper.updateDeleted(lastTradeOrder.getId(),0);
-                tradeOrderCountryMapper.updateDeleted(orderId,1);
-                tradeOrderCountryMapper.updateDeleted(lastTradeOrder.getId(),0);
-                tradeOrderRoomModelMapper.updateDeleted(orderId,1);
-                tradeOrderRoomModelMapper.updateDeleted(lastTradeOrder.getId(),0);
-                tradeOrderFloorMapper.updateDeleted(orderId,1);
-                tradeOrderFloorMapper.updateDeleted(lastTradeOrder.getId(),0);
-                tradeOrderTotalMapper.updateDeleted(orderId,1);
-                tradeOrderTotalMapper.updateDeleted(lastTradeOrder.getId(),0);
+                tradeOrderMapper.updateOrderDeleted(orderId, 1);
+                tradeOrderMapper.updateOrderDeleted(lastTradeOrder.getId(), 0);
+                tradeOrderUserMapper.updateDeleted(orderId, 1);
+                tradeOrderUserMapper.updateDeleted(lastTradeOrder.getId(), 0);
+                tradeDetailMapper.updateDeleted(orderId, 1);
+                tradeDetailMapper.updateDeleted(lastTradeOrder.getId(), 0);
+                tradeDetailBaseMapper.updateDeleted(orderId, 1);
+                tradeDetailBaseMapper.updateDeleted(lastTradeOrder.getId(), 0);
+                tradeVisitorMapper.updateDeleted(orderId, 1);
+                tradeVisitorMapper.updateDeleted(lastTradeOrder.getId(), 0);
+                tradeOrderCountryMapper.updateDeleted(orderId, 1);
+                tradeOrderCountryMapper.updateDeleted(lastTradeOrder.getId(), 0);
+                tradeOrderRoomModelMapper.updateDeleted(orderId, 1);
+                tradeOrderRoomModelMapper.updateDeleted(lastTradeOrder.getId(), 0);
+                tradeOrderFloorMapper.updateDeleted(orderId, 1);
+                tradeOrderFloorMapper.updateDeleted(lastTradeOrder.getId(), 0);
+                tradeOrderTotalMapper.updateDeleted(orderId, 1);
+                tradeOrderTotalMapper.updateDeleted(lastTradeOrder.getId(), 0);
                 Map<String, Object> extMap = new HashMap<>();
                 extMap.put("result", "审核不通过");
                 TradeOrderLogUtils.setOrderInfo(orderId, tradeOrderDO.getOrderStatus(), tradeOrderDO.getOrderStatus(), extMap);
@@ -727,24 +515,24 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
         List<TradeOrderDO> tradeOrderDoList = tradeOrderMapper.queryOrderByLast(tradeOrderDO.getOrderNo());
         if (tradeOrderDoList != null && !tradeOrderDoList.isEmpty()) {
             TradeOrderDO lastTradeOrder = tradeOrderDoList.get(0);
-            tradeOrderMapper.updateOrderDeleted(orderId,1);
-            tradeOrderMapper.updateOrderDeleted(lastTradeOrder.getId(),0);
-            tradeOrderUserMapper.updateDeleted(orderId,1);
-            tradeOrderUserMapper.updateDeleted(lastTradeOrder.getId(),0);
-            tradeDetailMapper.updateDeleted(orderId,1);
-            tradeDetailMapper.updateDeleted(lastTradeOrder.getId(),0);
-            tradeDetailBaseMapper.updateDeleted(orderId,1);
-            tradeDetailBaseMapper.updateDeleted(lastTradeOrder.getId(),0);
-            tradeVisitorMapper.updateDeleted(orderId,1);
-            tradeVisitorMapper.updateDeleted(lastTradeOrder.getId(),0);
-            tradeOrderCountryMapper.updateDeleted(orderId,1);
-            tradeOrderCountryMapper.updateDeleted(lastTradeOrder.getId(),0);
-            tradeOrderRoomModelMapper.updateDeleted(orderId,1);
-            tradeOrderRoomModelMapper.updateDeleted(lastTradeOrder.getId(),0);
-            tradeOrderFloorMapper.updateDeleted(orderId,1);
-            tradeOrderFloorMapper.updateDeleted(lastTradeOrder.getId(),0);
-            tradeOrderTotalMapper.updateDeleted(orderId,1);
-            tradeOrderTotalMapper.updateDeleted(lastTradeOrder.getId(),0);
+            tradeOrderMapper.updateOrderDeleted(orderId, 1);
+            tradeOrderMapper.updateOrderDeleted(lastTradeOrder.getId(), 0);
+            tradeOrderUserMapper.updateDeleted(orderId, 1);
+            tradeOrderUserMapper.updateDeleted(lastTradeOrder.getId(), 0);
+            tradeDetailMapper.updateDeleted(orderId, 1);
+            tradeDetailMapper.updateDeleted(lastTradeOrder.getId(), 0);
+            tradeDetailBaseMapper.updateDeleted(orderId, 1);
+            tradeDetailBaseMapper.updateDeleted(lastTradeOrder.getId(), 0);
+            tradeVisitorMapper.updateDeleted(orderId, 1);
+            tradeVisitorMapper.updateDeleted(lastTradeOrder.getId(), 0);
+            tradeOrderCountryMapper.updateDeleted(orderId, 1);
+            tradeOrderCountryMapper.updateDeleted(lastTradeOrder.getId(), 0);
+            tradeOrderRoomModelMapper.updateDeleted(orderId, 1);
+            tradeOrderRoomModelMapper.updateDeleted(lastTradeOrder.getId(), 0);
+            tradeOrderFloorMapper.updateDeleted(orderId, 1);
+            tradeOrderFloorMapper.updateDeleted(lastTradeOrder.getId(), 0);
+            tradeOrderTotalMapper.updateDeleted(orderId, 1);
+            tradeOrderTotalMapper.updateDeleted(lastTradeOrder.getId(), 0);
 
             Map<String, Object> extMap = new HashMap<>();
             extMap.put("result", "审核撤回");
@@ -1392,45 +1180,6 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
         return categoryList.get();
     }
 
-    /**
-     * 访问这个接口的目前是平台,平台用于给外部旅行社搬单。
-     * 且产品不关联门店
-     */
-    @Override
-    public List<CategoryRespDTO> getCategoryAndSpuAllOuterOtc(Long distributorId, String travelDate) {
-        if (distributorId == null || StrUtil.isBlank(travelDate)) {
-            return Collections.emptyList();
-        }
-        DistributorDO distributorDO = distributorMapper.selectById(distributorId);
-        // 平台租户
-        Long tenantId = distributorDO.getAccountTenantId();
-        Set<Long> categoryIdSet = new HashSet<>();
-        List<ProductSpuRespDTO> productSpuList;
-        List<CategoryRespDTO> categoryList = new ArrayList<>();
-        String outType = "2";
-
-        //获取平台产品
-        productSpuList = tradeDetailMapper.selectSpuListByTenantId(null, tenantId, outType, travelDate);
-        Set<Long> ids = productSpuList.stream().map(ProductSpuRespDTO::getCategoryId).collect(Collectors.toSet());
-        if (!ids.isEmpty()) {
-            categoryList = productApi.getCategoryListByIds(1, new ArrayList<>(ids)).getCheckedData();
-            categoryIdSet = getIdGrouping(categoryList, 1);
-        }
-        //绑定子节点产品
-        for (Long id : categoryIdSet) {
-            List<ProductSpuRespDTO> collect = productSpuList.stream()
-                    .filter(spu -> Objects.equals(spu.getCategoryId(), id))
-                    .collect(Collectors.toList());
-            categoryList.stream()
-                    .filter(p -> id.equals(p.getId()))
-                    .findFirst()
-                    .ifPresent(dto -> dto.setProductSpuRespDTOList(collect));
-        }
-
-        categoryList.sort(Comparator.comparing(CategoryRespDTO::getSortNum));
-        return categoryList;
-    }
-
 
     public Set<Long> getIdGrouping(List<CategoryRespDTO> categoryList, Integer type) {
         // 按照父级ID分组
@@ -1891,7 +1640,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
         BigDecimal otherMoney = summary.getOtherMoney();
         ShipTradeOrderCreateReqVO shipTradeOrderCreateReqVO = BeanUtils.toBean(createVO, ShipTradeOrderCreateReqVO.class);
         shipTradeOrderCreateReqVO.setDistributorId(loginUser.getDistributorId());
-        if(createVO.isMoveOrder()){
+        if (createVO.isMoveOrder()) {
             shipTradeOrderCreateReqVO.setMoveOrder(true);
         }
         shipTradeOrderCreateReqVO.setGroupNo(createVO.getGroupNo());
@@ -1899,12 +1648,6 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
             shipTradeOrderCreateReqVO.setAmount(orderMoney);
             shipTradeOrderCreateReqVO.setPayAmount(realAmount);
             shipTradeOrderCreateReqVO.setConfirmType(1);
-//            TradeOrderBindDO tradeOrderBindDO = new TradeOrderBindDO();
-//            tradeOrderBindDO.setId(IdWorker.getId());
-//            tradeOrderBindDO.setType(1);
-//            tradeOrderBindDO.setCustom(createVO.getSummary().getOrderMoney().toString());
-//            tradeOrderBindDO.setRemark("create订单金额修改，订单金额：" + 0 + "，订单修改后金额：" + realAmount);
-//            shipTradeOrderCreateReqVO.setTradeOrderBindDO(tradeOrderBindDO);
         } else {
             shipTradeOrderCreateReqVO.setConfirmType(0);
             shipTradeOrderCreateReqVO.setAmount(orderMoney);
@@ -1930,7 +1673,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
 
         ShipTradeOrderCreateReqVO.OrderProperty orderProperty = new ShipTradeOrderCreateReqVO.OrderProperty();
         orderProperty.setSellMethod(SellMethodEnum.OTC.getType());
-        if (loginUser.getDistributorId() == null||createVO.isMoveOrder()) {
+        if (loginUser.getDistributorId() == null || createVO.isMoveOrder()) {
             orderProperty.setSellMethod(SellMethodEnum.OTC_MOVE_ORDER.getType());
         }
         orderProperty.setSourceId(distributorDO.getId() + "");
@@ -1977,21 +1720,6 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
         }
         orderItem.setDetailList(detailList);
         BigDecimal spuMoney = new BigDecimal(0);
-        //[ {
-        //  "productId" : 1995379153741963265,
-        //  "required" : 1,
-        //  "price" : 50,
-        //  "tourist" : [ ]
-        //}, {
-        //  "productId" : 1966419302406098945,
-        //  "required" : 1,
-        //  "price" : 50,
-        //  "tourist" : [ ]
-        //}, {
-        //  "productId" : 1966037573074767874,
-        //  "price" : 100,
-        //  "tourist" : [ "c20d5bd5-9583-4986-9889-ecc127585bd8", "8dab0347-60d0-4c34-aab1-1f0e0260e3a6" ]
-        //} ]
         for (TradeSpuReqVO tradeSpuReqVO : createVO.getSpuList()) {
             ShipTradeOrderCreateReqVO.OrderDetail orderDetail1 = new ShipTradeOrderCreateReqVO.OrderDetail();
             //0 游船产品 1 附加产品 2：赠票
@@ -2132,7 +1860,6 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
         int auditType = 0;
         String orderNo = tradeOrderDO.getOrderNo();
         Date updateTime = new Date();
-//        List<TradeOrderCountryReqVO> countryData = createVO.getCountryData();
         ShipTradeOrderCreateReqVO shipTradeOrderCreateReqVO = BeanUtils.toBean(createVO, ShipTradeOrderCreateReqVO.class);
         shipTradeOrderCreateReqVO.setDistributorId(loginUser.getDistributorId());
         shipTradeOrderCreateReqVO.setGroupNo(createVO.getGroupNo());
@@ -2144,7 +1871,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
         Long discountId = summary.getDiscountId();
         shipTradeOrderCreateReqVO.setAmount(orderMoney);
         shipTradeOrderCreateReqVO.setPayAmount(realAmount);
-        if ((orderMoney != null && realAmount != null && realAmount.compareTo(orderMoney) != 0) ||!Objects.equals(shipTradeOrderCreateReqVO.getAmount(), tradeOrderDO.getAmount())) {
+        if ((orderMoney != null && realAmount != null && realAmount.compareTo(orderMoney) != 0) || !Objects.equals(shipTradeOrderCreateReqVO.getAmount(), tradeOrderDO.getAmount())) {
             shipTradeOrderCreateReqVO.setConfirmType(1);
             TradeOrderBindDO tradeOrderBindDO = new TradeOrderBindDO();
             tradeOrderBindDO.setId(IdWorker.getId());
@@ -2318,7 +2045,8 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
         }
         String msg = "";
         if (auditType > 0 && createVO.getIsYd() != 1) {
-            tradeOrderMapper.update(new UpdateWrapper<TradeOrderDO>().set("audit_type", auditType).set("order_status", TradeOrderStatusEnum.TRANSFER.getStatus()).set("audit_status", 1).eq("id", neworderId));
+            AuditUserDO auditUserDO = auditUserMapper.selectOne(new LambdaQueryWrapperX<AuditUserDO>().eq(AuditUserDO::getType, auditType).eq(AuditUserDO::getDeleted, 0).orderByDesc(AuditUserDO::getCreateTime).last("limit 1"));
+            tradeOrderMapper.update(new UpdateWrapper<TradeOrderDO>().set("audit_type", auditType).set("audit_user", auditUserDO.getId()).set("order_status", TradeOrderStatusEnum.TRANSFER.getStatus()).set("audit_status", 1).eq("id", neworderId));
             msg = "修改提交成功，等待管理员审核";
         }
 
@@ -2332,26 +2060,6 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
 
     }
 
-    private static ShipTradeOrderCreateReqVO.@NotNull Visitor getVisitor(TradeVistorReqVO tradeVistorReqVO) {
-        ShipTradeOrderCreateReqVO.Visitor visitor = new ShipTradeOrderCreateReqVO.Visitor();
-        visitor.setName(tradeVistorReqVO.getName());
-        visitor.setMobile(tradeVistorReqVO.getMobile());
-        visitor.setCredentialNo(tradeVistorReqVO.getCardNo());
-        visitor.setCredentialType(tradeVistorReqVO.getCardType());
-        visitor.setYczz(tradeVistorReqVO.getYichang());
-        visitor.setCqzz(tradeVistorReqVO.getChongqing());
-        visitor.setAge(tradeVistorReqVO.getAge());
-        visitor.setBirthday(tradeVistorReqVO.getBirthday());
-        visitor.setGender(tradeVistorReqVO.getGender());
-        visitor.setNationality(tradeVistorReqVO.getNationality());
-        visitor.setCohabitation(tradeVistorReqVO.getCohabitation());
-        visitor.setRoomId(tradeVistorReqVO.getRoomId());
-        visitor.setType(tradeVistorReqVO.getType());
-        visitor.setRoomIndexId(tradeVistorReqVO.getRoomIndexId());
-        visitor.setRoomModelId(tradeVistorReqVO.getRoomModelId());
-        visitor.setFloor(tradeVistorReqVO.getFloor());
-        return visitor;
-    }
 
     @Override
     public TradeOrderRespNewVO getOrderInfoNew(Long id) {
@@ -2478,7 +2186,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
                         TradeOrderConfirmationCountryRespVO::getNationalityName,
                         Collectors.summingInt(TradeOrderConfirmationCountryRespVO::getNum)
                 ));
-        countryMap.keySet().stream().forEach(key -> {
+        countryMap.keySet().forEach(key -> {
             countryDesList.add(countryMap.get(key) + key);
         });
         orderRespNewVO.setCountryDesc(String.join(",", countryDesList));
@@ -2584,7 +2292,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
         List<Map<String, Object>> roomData = new ArrayList<>();
         List<TradeOrderConfirmationCountryRespVO> countryList = orderConfirmation.getCountryList();
         if (countryList != null) {
-            countryList.stream().forEach(item -> {
+            countryList.forEach(item -> {
                 String roomModelName = item.getRoomModelName();
                 if (item.getFloor() == null) {
                     if ("leader".equals(item.getType())) {
@@ -2645,41 +2353,9 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
     }
 
 
-    private int getPersonNum(TradeOrderRoomModelBaseVO roomModel) {
-        int n = 0;
-        n += (roomModel.getAdultAloneNum() + roomModel.getAdultTakeNum() + roomModel.getAdultPlusNum());
-        n += (roomModel.getChildNonTakeNum() + roomModel.getChildTakeNum() + roomModel.getChildPlusNum());
-        n += (roomModel.getBabyNonTakeNum() + roomModel.getBabyTakeNum() + roomModel.getBabyPlusNum());
-        return n;
-    }
-
-
-    private String getPersonTypeDes(TradeOrderRoomModelBaseVO roomModel) {
-        List<String> des = new ArrayList<>();
-        int adultNum = (roomModel.getAdultAloneNum() + roomModel.getAdultTakeNum() + roomModel.getAdultPlusNum());
-        int childNum = (roomModel.getChildNonTakeNum() + roomModel.getChildTakeNum() + roomModel.getChildPlusNum());
-        int babyNum = (roomModel.getBabyNonTakeNum() + roomModel.getBabyTakeNum() + roomModel.getBabyPlusNum());
-        if (adultNum > 0) {
-            des.add("成人");
-        }
-        if (childNum > 0) {
-            des.add("儿童");
-        }
-        if (babyNum > 0) {
-            des.add("婴儿");
-        }
-        return String.join("/", des);
-    }
-
     private String getPersonTypeDes1(String type) {
-        String des = "";
+        String des;
         switch (type) {
-            case "adultTake":
-            case "adultPlus":
-            case "leader":
-            case "with":
-                des = "成人";
-                break;
             case "childTake":
             case "childPlus":
             case "childNonTake":
@@ -2690,6 +2366,10 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
             case "babyNonTake":
                 des = "婴儿";
                 break;
+            case "adultTake":
+            case "adultPlus":
+            case "leader":
+            case "with":
             default:
                 des = "成人";
                 break;
@@ -2698,14 +2378,8 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
     }
 
     private String getPersonTypeDesEn1(String type) {
-        String des = "";
+        String des;
         switch (type) {
-            case "adultTake":
-            case "adultPlus":
-            case "leader":
-            case "with":
-                des = "Adults";
-                break;
             case "childTake":
             case "childPlus":
             case "childNonTake":
@@ -2716,6 +2390,10 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
             case "babyNonTake":
                 des = "Infants";
                 break;
+            case "adultTake":
+            case "adultPlus":
+            case "leader":
+            case "with":
             default:
                 des = "Adults";
                 break;
@@ -2723,24 +2401,6 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
         return des;
     }
 
-    private String getPersonTypeDesEn(TradeOrderRoomModelBaseVO roomModel) {
-        List<String> des = new ArrayList<>();
-        int adultNum = (roomModel.getAdultAloneNum() + roomModel.getAdultTakeNum() + roomModel.getAdultPlusNum());
-        int childNum = (roomModel.getChildNonTakeNum() + roomModel.getChildTakeNum() + roomModel.getChildPlusNum());
-        int babyNum = (roomModel.getBabyNonTakeNum() + roomModel.getBabyTakeNum() + roomModel.getBabyPlusNum());
-        if (adultNum > 0) {
-            des.add("Adults");
-        }
-        if (childNum > 0) {
-            des.add("Children");
-        }
-        if (babyNum > 0) {
-            des.add("Infants");
-        }
-        return String.join("/", des);
-    }
-
-
     static class MergeStrategy extends AbstractMergeStrategy {
 
         @Override

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/pda/PdaServiceImpl.java

@@ -238,8 +238,8 @@ public class PdaServiceImpl implements PdaService {
 
     private void bulidDetailVisitor(List<TradeDetailRespVO> detailList) {
         detailList.forEach(tradeDetail -> {
-            List<TradeVisitorDO> visitorDOS = tradeOrderRepositoryService.queryVisitorByDetailId(tradeDetail.getId());
-            tradeDetail.setVisitors(visitorDOS);
+            List<TradeVisitorDO> visitorList = tradeOrderRepositoryService.queryVisitorByDetailId(tradeDetail.getId());
+            tradeDetail.setVisitors(visitorList);
         });
     }
 }

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/smsSendconfig/SmsSendconfigServiceImpl.java

@@ -10,8 +10,6 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.yc.ship.framework.common.pojo.PageResult;
 import com.yc.ship.framework.common.util.object.BeanUtils;
 import com.yc.ship.framework.mybatis.core.util.MyBatisUtils;
-import com.yc.ship.module.infra.api.config.ConfigApi;
-
 import com.yc.ship.module.trade.api.sms.dto.SmsReqDTO;
 import com.yc.ship.module.trade.controller.admin.smsSendconfig.vo.SmsSendconfigPageReqVO;
 import com.yc.ship.module.trade.controller.admin.smsSendconfig.vo.SmsSendconfigQueryRespVO;
@@ -63,9 +61,6 @@ public class SmsSendconfigServiceImpl implements SmsSendconfigService {
     @Resource
     private SmsSendLogMapper smsSendLogMapper;
 
-    @Resource
-    private ConfigApi configApi;
-
     @Override
     public Long createSmsSendconfig(SmsSendconfigSaveReqVO createReqVO) {
         // 插入
@@ -74,16 +69,16 @@ public class SmsSendconfigServiceImpl implements SmsSendconfigService {
         smsSendconfigMapper.insert(smsSendconfig);
 
 //        smsProductMapper.delete(SmsProductDO::getSmsTemplateId, smsSendconfig.getId());
-        List<SmsProductDO> smsProductDOS = new ArrayList<>();
+        List<SmsProductDO> smsProductList = new ArrayList<>();
         for (Long productId : createReqVO.getProductIdList()) {
             SmsProductDO smsProductDO = new SmsProductDO();
             smsProductDO.setId(IdWorker.getId(smsProductDO));
             smsProductDO.setProductId(productId);
             smsProductDO.setSmsTemplateId(smsSendconfig.getId());
-            smsProductDOS.add(smsProductDO);
+            smsProductList.add(smsProductDO);
         }
-        smsProductMapper.insertBatch(smsProductDOS);
-        if(createReqVO.getSendType()!=null && createReqVO.getSendType()==1){
+        smsProductMapper.insertBatch(smsProductList);
+        if (createReqVO.getSendType() != null && createReqVO.getSendType() == 1) {
             smsSendMsg(1, smsSendconfig.getId());
         }
         return smsSendconfig.getId();
@@ -98,15 +93,15 @@ public class SmsSendconfigServiceImpl implements SmsSendconfigService {
         smsSendconfigMapper.updateById(updateObj);
 
         smsProductMapper.delete(SmsProductDO::getSmsTemplateId, updateReqVO.getId());
-        List<SmsProductDO> smsProductDOS = new ArrayList<>();
+        List<SmsProductDO> smsProductList = new ArrayList<>();
         for (Long productId : updateReqVO.getProductIdList()) {
             SmsProductDO smsProductDO = new SmsProductDO();
             smsProductDO.setId(IdWorker.getId(smsProductDO));
             smsProductDO.setProductId(productId);
             smsProductDO.setSmsTemplateId(updateObj.getId());
-            smsProductDOS.add(smsProductDO);
+            smsProductList.add(smsProductDO);
         }
-        smsProductMapper.insertBatch(smsProductDOS);
+        smsProductMapper.insertBatch(smsProductList);
 
     }
 
@@ -129,20 +124,20 @@ public class SmsSendconfigServiceImpl implements SmsSendconfigService {
     @Override
     public SmsSendconfigDO getSmsSendconfig(Long id) {
         SmsSendconfigDO smsSendconfigDO = smsSendconfigMapper.selectById(id);
-        List<SmsProductDO> list = smsProductMapper.selectList(SmsProductDO::getSmsTemplateId,smsSendconfigDO.getId());
-        List<Long> productIds = list.stream().map(item -> item.getProductId()).distinct().collect(Collectors.toList());
+        List<SmsProductDO> list = smsProductMapper.selectList(SmsProductDO::getSmsTemplateId, smsSendconfigDO.getId());
+        List<Long> productIds = list.stream().map(SmsProductDO::getProductId).distinct().collect(Collectors.toList());
         smsSendconfigDO.setProductIdList(productIds);
         return smsSendconfigDO;
     }
 
     @Override
     @Async
-    public void smsSendMsg(int type,Long id) {
+    public void smsSendMsg(int type, Long id) {
         //发送短信
-        List<SmsSendconfigQueryRespVO> list = smsSendconfigMapper.querySendList(id,type);
+        List<SmsSendconfigQueryRespVO> list = smsSendconfigMapper.querySendList(id, type);
         for (SmsSendconfigQueryRespVO smsSendconfigQueryRespVO : list) {
             SmsReqDTO smsReqDTO = new SmsReqDTO();
-            if(type==0) {
+            if (type == 0) {
                 Integer sendType = smsSendconfigQueryRespVO.getSendType();
                 try {
                     if (sendType != null && sendType == 2) {
@@ -152,16 +147,16 @@ public class SmsSendconfigServiceImpl implements SmsSendconfigService {
                         Integer sendDateType = smsSendconfigQueryRespVO.getSendDateType();
                         if (sendDateType != null && sendDateType == 1) {
                             //2025-01-22 19:00
-                            String dateStr = smsSendconfigQueryRespVO.getUseDate().substring(0,10) + " " + sendTime;
+                            String dateStr = smsSendconfigQueryRespVO.getUseDate().substring(0, 10) + " " + sendTime;
                             //2025-01-22 17:30
                             Date sendTimeDate = DateUtil.parse(dateStr, DatePattern.NORM_DATETIME_MINUTE_PATTERN);
                             //当前时间大于发送时间，则跳过
-                            if (DateUtil.isSameDay(sendTimeDate,new Date()) || DateUtil.tomorrow().compareTo(sendTimeDate) < 0) {
+                            if (DateUtil.isSameDay(sendTimeDate, new Date()) || DateUtil.tomorrow().compareTo(sendTimeDate) < 0) {
                                 continue;
                             }
                         }
                         if (sendDateType != null && sendDateType == 2) {
-                            String dateStr = smsSendconfigQueryRespVO.getUseDate().substring(0,10) + " " + sendTime;
+                            String dateStr = smsSendconfigQueryRespVO.getUseDate().substring(0, 10) + " " + sendTime;
                             Date sendTimeDate = DateUtil.parse(dateStr, DatePattern.NORM_DATETIME_MINUTE_PATTERN);
                             //当前时间小于发送时间，则跳过
                             //2025-01-01 17:30
@@ -169,18 +164,18 @@ public class SmsSendconfigServiceImpl implements SmsSendconfigService {
                                 continue;
                             }
                         }
-                    }else{
+                    } else {
                         continue;
                     }
-                }catch (Exception e){
-                    log.error("定时任务发送短信异常,解析失败",e);
+                } catch (Exception e) {
+                    log.error("定时任务发送短信异常,解析失败", e);
                     break;
                 }
             }
             //sxly
             String appId = smsSendconfigQueryRespVO.getApiKey();
             //Sx@202305
-            String secretKey =smsSendconfigQueryRespVO.getApiSecret();
+            String secretKey = smsSendconfigQueryRespVO.getApiSecret();
             //https://112.35.10.201:58888/sms/tmpsubmit
             String url = smsSendconfigQueryRespVO.getApiUrl();
             //jFKNw6Cis
@@ -192,15 +187,15 @@ public class SmsSendconfigServiceImpl implements SmsSendconfigService {
             smsSendLogDO.setOrderNo(smsSendconfigQueryRespVO.getOrderNo());
             smsSendLogDO.setSmsConfigId(smsSendconfigQueryRespVO.getId() + "");
 
-            List mobileList = new ArrayList<>();
+            List<String> mobileList = new ArrayList<>();
             mobileList.add(smsSendconfigQueryRespVO.getMobile());
             smsReqDTO.setMobile(mobileList);
             smsReqDTO.setSmsTemplateId(smsSendconfigQueryRespVO.getApiTemplateId());
             String input = smsSendconfigQueryRespVO.getSmsParms();
             //【1】产品名称； 【2】订单号； 【3】游玩日期； 【4】联系人；【5】购买数量； 【6】团名称； 【7】旅行社联系人； 【8】联系电话；
-            input = input.replaceAll("【1】", smsSendconfigQueryRespVO.getProductName().substring(0,10).replace("【","").replace("】","").replace("-",""));
+            input = input.replaceAll("【1】", smsSendconfigQueryRespVO.getProductName().substring(0, 10).replace("【", "").replace("】", "").replace("-", ""));
             input = input.replaceAll("【2】", smsSendconfigQueryRespVO.getOrderNo());
-            input = input.replaceAll("【3】", smsSendconfigQueryRespVO.getUseDate().substring(0,10));
+            input = input.replaceAll("【3】", smsSendconfigQueryRespVO.getUseDate().substring(0, 10));
             input = input.replaceAll("【4】", smsSendconfigQueryRespVO.getContactName());
             input = input.replaceAll("【5】", smsSendconfigQueryRespVO.getNum() + "");
             input = input.replaceAll("【6】", smsSendconfigQueryRespVO.getSourceName());
@@ -210,22 +205,22 @@ public class SmsSendconfigServiceImpl implements SmsSendconfigService {
             input = input.replaceAll("【10】", smsSendconfigQueryRespVO.getShortName());
             smsReqDTO.setSmsContent(input);
             String result;
-            if(StringUtils.isNotBlank(smsSendconfigQueryRespVO.getChannelCode()) && StringUtils.equals("UNICOM",smsSendconfigQueryRespVO.getChannelCode())) {
+            if (StringUtils.isNotBlank(smsSendconfigQueryRespVO.getChannelCode()) && StringUtils.equals("UNICOM", smsSendconfigQueryRespVO.getChannelCode())) {
                 JSONArray parts = JSONUtil.parseArray(input);
                 JSONArray templates = JSONUtil.parseArray(smsSendconfigQueryRespVO.getTemplateParams());
-                Map map = new HashMap<>();
+                Map<Object, Object> map = new HashMap<>();
                 for (int i = 0; i < templates.size(); i++) {
-                    String key =  templates.getStr(i);
-                    String value =  parts.getStr(i);
-                    map.put(key,value);
+                    String key = templates.getStr(i);
+                    String value = parts.getStr(i);
+                    map.put(key, value);
                 }
                 String content = StrUtil.format(smsSendconfigQueryRespVO.getSmsContent(), map);
                 smsSendLogDO.setSmsContent(content);
                 String mobile = smsSendconfigQueryRespVO.getMobile();
-                log.error("[下单成功短信发送参数]：" + content+";手机号："+mobile);
+                log.error("[下单成功短信发送参数]：{};手机号：{}", content, mobile);
                 HttpClient httpclient = new HttpClient();
                 PostMethod post = new PostMethod(url);
-                post.getParams().setParameter(HttpMethodParams.HTTP_CONTENT_CHARSET,"gbk");
+                post.getParams().setParameter(HttpMethodParams.HTTP_CONTENT_CHARSET, "gbk");
                 post.addParameter("SpCode", signName);
                 post.addParameter("LoginName", appId);
                 post.addParameter("Password", secretKey);
@@ -234,7 +229,7 @@ public class SmsSendconfigServiceImpl implements SmsSendconfigService {
                 Random random = new Random();
                 int ranNum = random.nextInt(9);
                 String serialNumber = SmsUtil.createOrderNo(ranNum + "");
-                if(serialNumber.length()>20) {
+                if (serialNumber.length() > 20) {
                     serialNumber = serialNumber.substring(0, 19);
                 }
                 post.addParameter("SerialNumber", serialNumber);
@@ -244,17 +239,17 @@ public class SmsSendconfigServiceImpl implements SmsSendconfigService {
                 try {
                     httpclient.executeMethod(post);
                     result = new String(post.getResponseBody(), "gbk");
-                    log.error("[下单成功短信返回参数]：" +result);
-                }catch (Exception e){
-                    log.error("[下单成功短信发送异常]：" + e.getMessage());
-                    result ="发送失败"+e.getMessage();
+                    log.error("[下单成功短信返回参数]：{}", result);
+                } catch (Exception e) {
+                    log.error("[下单成功短信发送异常]：{}", e.getMessage());
+                    result = "发送失败" + e.getMessage();
                 }
-            }else{
+            } else {
                 smsSendLogDO.setSmsContent(input);
                 result = smsService.sendMsg(smsReqDTO);
             }
             smsSendLogDO.setResult(result);
-            if (result != null && result.indexOf("成功") != -1) {
+            if (result != null && result.contains("成功")) {
                 smsSendLogDO.setStatus(1);
             } else {
                 smsSendLogDO.setStatus(0);
@@ -274,20 +269,7 @@ public class SmsSendconfigServiceImpl implements SmsSendconfigService {
     public PageResult<SmsSendconfigQueryRespVO> querySendLogList(SmsSendconfigPageReqVO pageReqVO) {
         IPage<SmsSendconfigDO> iPage = MyBatisUtils.buildPage(pageReqVO);
         IPage<SmsSendconfigQueryRespVO> page = smsSendconfigMapper.querySendLogList(iPage, pageReqVO);
-        PageResult<SmsSendconfigQueryRespVO> result = new PageResult<>(page.getRecords(), page.getTotal());
-        return result;
-    }
-
-
-    public static void main(String[] args) {
-        String dateStr = "2025-01-24" + " " + "21:30";
-        Date sendTimeDate = DateUtil.parse(dateStr, DatePattern.NORM_DATETIME_MINUTE_PATTERN);
-        //当前时间大于发送时间，则跳过
-        if (DateUtil.isSameDay(sendTimeDate,new Date()) || DateUtil.tomorrow().compareTo(sendTimeDate) < 0) {
-            System.out.println("11111");
-        }
-
-
+        return new PageResult<>(page.getRecords(), page.getTotal());
     }
 
 }