循环依赖问题

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/KwpSettlementLogisticsService.java

@@ -48,7 +48,6 @@ public class KwpSettlementLogisticsService {
     @DubboReference(version = "1.0.0", group = "design", check = false)
     private RemoteSystemService remoteSystemService;
     private final KwpSettlementLogisticsMapper settlementLogisticsMapper;
-    private final KwpLedgerLogisticsUnitService logisticsUnitService;
     @Resource
     private KwpSettlementWalletService kwpSettlementWalletService;
     @Resource

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/KwpSettlementWalletService.java

@@ -66,15 +66,17 @@ import java.util.stream.Collectors;
 @Slf4j
 @RequiredArgsConstructor
 public class KwpSettlementWalletService {
-    private final KwpLedgerLogisticsMapper kwpLedgerLogisticsMapper;
     private final KwpSettlementWalletMapper settlementWalletMapper;
+    private final KwpLedgerLogisticsMapper kwpLedgerLogisticsMapper;
     private final KwpSettlementLogisticsMapper kwpSettlementLogisticsMapper;
+
     private final KwpLedgerTradeOrderService tradeOrderService;
     private final KwpLedgerLogisticsOrderService kwpLedgerLogisticsOrderService;
-    private final KwpSettlementLogisticsService kwpSettlementLogisticsService;
     private final WalletBusinessService walletBusinessService;
     @Resource
     private KwpSettlementTradeService kwpSettlementTradeService;
+    @Resource
+    private KwpSettlementLogisticsService kwpSettlementLogisticsService;
     private final PayCenterService payCenterService;
     private final KwpWalletRelationService walletRelationService;
     private final RedisLockUtil redisLockUtil;
@@ -149,17 +151,6 @@ public class KwpSettlementWalletService {
     }
 
 
-    /**
-     * 结算-物流订单详情
-     *
-     * @param id 结算物流订单id
-     * @author Aick Spt
-     * @date 2023-07-19 09:11
-     */
-    public SettlementWalletDto detailLogisticsPayment(Long id) {
-        return settlementWalletMapper.detailLogisticsPayment(id);
-    }
-
     /**
      * 物流-电子钱包付款（货到付款）结算记录-新增
      *
@@ -317,34 +308,6 @@ public class KwpSettlementWalletService {
         return null;
     }
 
-//    public PageRes<SettlementWalletVo> pageListTradePayment(SettlementWalletReq settlementWalletReq) {
-////        //todo 查询缓存，获取客户企业id
-////        String keywords = settlementReq.getKeywords();
-////        if (StringUtils.isNotBlank(keywords)) {
-////            System.out.println("关键之：" + keywords);
-////        }
-//        PageHelper.startPage(settlementWalletReq.getPage(), settlementWalletReq.getPageSize());
-//
-//        List<SettlementWalletDto> settlementWalletLogisticsList = settlementWalletMapper.pageListLogisticsPayment(settlementWalletReq);
-//        for (SettlementWalletDto entity : settlementWalletLogisticsList) {
-//            entity.setCreateByText("创建人名称");
-//            entity.setUpdateByText("更新人名称");
-//        }
-//
-//        if (CollectionUtils.isEmpty(settlementWalletLogisticsList)) {
-//            return new PageRes<>(new PageInfo<>());
-//        }
-//
-//        //指定返回值
-//        List<SettlementWalletVo> collect = settlementWalletLogisticsList.stream().map(a -> {
-//            SettlementWalletVo settlementWalletVo = new SettlementWalletVo();
-//            BeanUtils.copyProperties(a, settlementWalletVo);
-//            return settlementWalletVo;
-//        }).collect(Collectors.toList());
-//
-//        return new PageRes<>(new PageInfo<>(collect));
-//    }
-
 
     /**
      * 采购-付款确认-货到付款
@@ -507,47 +470,6 @@ public class KwpSettlementWalletService {
         return PageRes.build(pageInfo, collect);
     }
 
-//    public PageRes<SettlementWalletVo> pageListTradeCollection(SettlementWalletReq settlementWalletReq) {
-//        PageHelper.startPage(settlementWalletReq.getPage(), settlementWalletReq.getPageSize());
-//
-//        List<SettlementWalletDto> settlementWalletLogisticsList = settlementWalletMapper.pageListLogisticsPayment(settlementWalletReq);
-//        for (SettlementWalletDto entity : settlementWalletLogisticsList) {
-//            entity.setCreateByText("创建人名称");
-//            entity.setUpdateByText("更新人名称");
-//        }
-//
-//        if (CollectionUtils.isEmpty(settlementWalletLogisticsList)) {
-//            return new PageRes<>(new PageInfo<>());
-//        }
-//
-//        Map<Long, UserCacheResDto> map = new HashMap<>(Global.NUMERICAL_SIXTEEN);
-//        //指定返回值
-//        List<SettlementWalletVo> collect = settlementWalletLogisticsList.stream().map(a -> {
-//            SettlementWalletVo settlementWalletVo = new SettlementWalletVo();
-//            BeanUtils.copyProperties(a, settlementWalletVo);
-//            Long createBy = a.getCreateBy();
-//            Long updateBy = a.getUpdateBy();
-//            UserCacheResDto userCacheResDto = map.get(createBy);
-//            if (Objects.isNull(userCacheResDto)) {
-//                userCacheResDto = remoteSystemService.queryUserCacheById(createBy);
-//                map.put(createBy, userCacheResDto);
-//            }
-//            if (Objects.nonNull(userCacheResDto)) {
-//                settlementWalletVo.setCreateByText(userCacheResDto.getName());
-//            }
-//            userCacheResDto = map.get(updateBy);
-//            if (Objects.isNull(userCacheResDto)) {
-//                userCacheResDto = remoteSystemService.queryUserCacheById(updateBy);
-//                map.put(updateBy, userCacheResDto);
-//            }
-//            if (Objects.nonNull(userCacheResDto)) {
-//                settlementWalletVo.setUpdateByText(userCacheResDto.getName());
-//            }
-//            return settlementWalletVo;
-//        }).collect(Collectors.toList());
-//
-//        return new PageRes<>(new PageInfo<>(collect));
-//    }
 
     /**
      * 销售-预付款