钱包接口补充完善

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/controller/WalletController.java

@@ -22,14 +22,15 @@ import org.springframework.web.bind.annotation.*;
 public class WalletController {
     @Resource
     private WalletService walletService;
+
     /**
      * 钱包总览信息
      *
      * @return
      */
     @GetMapping("overview")
-    public HttpResult overview() {
-        return HttpResult.ok(walletService.walletOverview());
+    public HttpResult overview(boolean queryChannel) {
+        return HttpResult.ok(walletService.walletOverview(queryChannel));
     }
 
     /**
@@ -42,6 +43,16 @@ public class WalletController {
         return HttpResult.ok(walletService.walletDetail(walletDetailReq));
     }
 
+    /**
+     * 查询资金明细-按渠道统计数量
+     *
+     * @return
+     */
+    @GetMapping("detailCount")
+    public HttpResult count(String entName) {
+        return HttpResult.ok(walletService.walletCount(entName));
+    }
+
     /**
      * 新增账目
      *
@@ -129,7 +140,15 @@ public class WalletController {
     public HttpResult prePayList(PrePayPage prePayPage) {
         return HttpResult.ok(walletService.prePayList(prePayPage));
     }
-
+    /**
+     * 预付列表-按渠道统计数量
+     *
+     * @return
+     */
+    @GetMapping("prePayCount")
+    public HttpResult prePayCount(String entName) {
+        return HttpResult.ok(walletService.walletCount(entName));
+    }
     /**
      * 预收列表
      *
@@ -140,7 +159,15 @@ public class WalletController {
     public HttpResult preReceiveList(PrePayPage prePayPage) {
         return HttpResult.ok(walletService.preReceiveList(prePayPage));
     }
-
+    /**
+     * 预收列表-按渠道统计数量
+     *
+     * @return
+     */
+    @GetMapping("preReceiveCount")
+    public HttpResult preReceiveCount(String entName) {
+        return HttpResult.ok(walletService.walletCount(entName));
+    }
     /**
      * 预付校验
      *

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/constant/PayCenterEnum.java

@@ -12,7 +12,7 @@ import lombok.Getter;
 public enum PayCenterEnum {
     MEMBER_DETAIL("/v1/member/detail", "会员详情"),
     MEMBER_WALLET("/v1/member/wallet", "钱包清单"),
-    MEMBER_WALLET_V2("/v2/member/wallet", "钱包清单"),
+    MEMBER_WALLET_V2("/v2/member/wallet", "钱包清单v2"),
     MEMBER_GENERAL("/v2/wallet/general", "总览信息"),
     WITHDRAW_DETAIL("/v1/wallet/withdraw/detail", "提现详情"),
     //    WITHDRAW_INDEX("/v1/wallet/withdraw/index", "提现清单"), 原接口

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/constant/WalletChannelEnum.java

@@ -7,20 +7,24 @@ import org.apache.commons.lang3.StringUtils;
  * @date 2023-07-27 12:54
  */
 public enum WalletChannelEnum {
+    ALL(0, "1", "all", "全部"),
+
     //汇付
-    HF(1, "1", "huifu"),
+    HF(1, "1", "huifu", "汇付"),
     //新生
-    XS(2, "2", "xinsheng"),
+    XS(2, "2", "newpay", "新生"),
     //中信
-    ZX(3, "3", "zhongxin");
+    ZX(3, "3", "citic", "中信");
 
     private final int status;
     private final String value;
+    private final String channel;
     private final String desc;
 
-    WalletChannelEnum(int status, String value, String desc) {
+    WalletChannelEnum(int status, String value, String channel, String desc) {
         this.status = status;
         this.value = value;
+        this.channel = channel;
         this.desc = desc;
     }
 
@@ -32,6 +36,10 @@ public enum WalletChannelEnum {
         return desc;
     }
 
+    public String getChannel() {
+        return channel;
+    }
+
     public String getValue() {
         return value;
     }

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/dto/wallet/PrePayWallet.java

@@ -12,7 +12,9 @@ import java.io.Serializable;
 public class PrePayWallet implements Serializable {
     @Serial
     private static final long serialVersionUID = 7340075510663637767L;
-
+    /**
+     * 预付时，uid代表付款方 预收时，uid代表预收方
+     */
     @JSONField(name = "uid")
     private String uid;
     @JSONField(name = "filter")

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/vo/res/ChannelCount.java

@@ -0,0 +1,39 @@
+package com.sckw.payment.model.vo.res;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * @author xucaiqin
+ * @date 2023-09-14 11:44:34
+ */
+@Getter
+@Setter
+@AllArgsConstructor
+@NoArgsConstructor
+public class ChannelCount implements Serializable {
+    @Serial
+    private static final long serialVersionUID = -1612413476552292266L;
+    /**
+     * 字典值
+     */
+    private String value;
+    /**
+     * 描述 中信
+     */
+    private String label;
+    /**
+     * 渠道 huifu
+     */
+    private String channel;
+    /**
+     * 数量
+     */
+    private Integer count;
+
+}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/vo/res/ChannelDetail.java

@@ -0,0 +1,30 @@
+package com.sckw.payment.model.vo.res;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * @author xucaiqin
+ * @date 2023-09-14 11:44:34
+ */
+@Getter
+@Setter
+public class ChannelDetail implements Serializable {
+    @Serial
+    private static final long serialVersionUID = -1612413476552292266L;
+    /**
+     * 渠道
+     */
+    private String channel;
+    /**
+     * 可用金额统计
+     */
+    private String money;
+    /**
+     * 总金额统计
+     */
+    private String totalMoney;
+}

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/vo/res/WalletDetail.java

@@ -8,5 +8,5 @@ import java.util.List;
  * @author xucaiqin
  * @date 2023-08-28 15:43:49
  */
-public record WalletDetail(String entName, String money, String chargingMoney,String wdingMoney ,int channel, List<String> channels) {
+public record WalletDetail(String entName, String money, String chargingMoney,String wdingMoney ,int channel, List<ChannelDetail> channels) {
 }

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

@@ -59,7 +59,7 @@ public class KwpLedgerLogisticsService extends AbsLedger {
     @Resource
     private KwpLedgerLogisticsTrackService logisticsTrackService;
     @Resource
-    private KwpSettlementLogisticsService settlementLogisticsService;
+    private KwpSettlementLogisticsService kwpSettlementLogisticsService;
     @Resource
     private KwpLedgerLogisticsUnitService logisticsUnitService;
     @Resource
@@ -594,7 +594,7 @@ public class KwpLedgerLogisticsService extends AbsLedger {
         kwpSettlementLogistics.setUpdateTime(LocalDateTime.now());
         kwpSettlementLogistics.setDelFlag(Global.UN_DELETED);
 
-        settlementLogisticsService.save(kwpSettlementLogistics);
+        kwpSettlementLogisticsService.save(kwpSettlementLogistics);
 
         logisticsTrackService.saveTrack(ledgerReq.getIdLong(), Global.EMPTY_STRING, LedgerEnum.SUCCESS);
 

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

@@ -61,7 +61,7 @@ public class KwpLedgerTradeService extends AbsLedger {
     private final KwpLedgerTradeUnitService tradeUnitService;
     private final MessageSender messageSender;
     @Resource
-    private KwpSettlementTradeService settlementTradeService;
+    private KwpSettlementTradeService kwpSettlementTradeService;
     @DubboReference(version = "1.0.0", group = "design", check = false)
     private RemoteSystemService remoteSystemService;
     @DubboReference(version = "1.0.0", group = "design", check = false)
@@ -600,7 +600,7 @@ public class KwpLedgerTradeService extends AbsLedger {
         kwpSettlementTrade.setUpdateBy(LoginUserHolder.getUserId());
         kwpSettlementTrade.setUpdateTime(LocalDateTime.now());
         kwpSettlementTrade.setDelFlag(Global.UN_DELETED);
-        settlementTradeService.save(kwpSettlementTrade);
+        kwpSettlementTradeService.save(kwpSettlementTrade);
 
         //更新贸易订单状态
         List<Long> list = kwpLedgerTradeOrders.stream().map(KwpLedgerTradeOrder::getTOrderId).toList();

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

@@ -58,8 +58,8 @@ import java.util.stream.Collectors;
 public class KwpSettlementOfflineService {
     private final KwpLedgerLogisticsMapper kwpLedgerLogisticsMapper;
     private final KwpSettlementOfflineMapper settlementOfflineMapper;
-    private final KwpSettlementTradeService settlementTradeService;
-    private final KwpLedgerTradeOrderService tradeOrderService;
+    private final KwpSettlementTradeService kwpSettlementTradeService;
+    private final KwpLedgerTradeOrderService kwpLedgerTradeOrderService;
     private final KwpSettlementTradeTrackService settlementTradeTrackService;
     private final KwpLedgerTradeService kwpLedgerTradeService;
     private final MessageSender messageSender;
@@ -317,7 +317,7 @@ public class KwpSettlementOfflineService {
         String key = String.format(RedisConstant.SETTLEMENT_KEY, payReq.getId());
         if (redisLockUtil.tryLock(key)) {
             try {
-                SettlementTradeDto byId = settlementTradeService.getById(payReq.getIdLong(), TradeUnitType.PURCHASE);
+                SettlementTradeDto byId = kwpSettlementTradeService.getById(payReq.getIdLong(), TradeUnitType.PURCHASE);
                 if (Objects.isNull(byId)) {
                     throw new BusinessException("结算单不存在");
                 }
@@ -351,7 +351,7 @@ public class KwpSettlementOfflineService {
                 if (subtract1.compareTo(new BigDecimal("0.0")) == NumberConstant.ZERO) {
                     status = SettlementEnum.ALL_PAYMENT.getStatus();
                     //查询对账单关联的订单
-                    List<KwpLedgerTradeOrder> kwpLedgerTradeOrders = tradeOrderService.queryList(byId.getLedgerId());
+                    List<KwpLedgerTradeOrder> kwpLedgerTradeOrders = kwpLedgerTradeOrderService.queryList(byId.getLedgerId());
                     if (CollectionUtils.isEmpty(kwpLedgerTradeOrders)) {
                         throw new BusinessException("未找到关联的贸易订单");
                     }
@@ -370,7 +370,7 @@ public class KwpSettlementOfflineService {
                 kwpSettlementTrade.setStatus(status);
                 kwpSettlementTrade.setUpdateBy(LoginUserHolder.getUserId());
                 kwpSettlementTrade.setUpdateTime(LocalDateTime.now());
-                settlementTradeService.updateById(kwpSettlementTrade);
+                kwpSettlementTradeService.updateById(kwpSettlementTrade);
                 //新增线下结算记录
                 KwpSettlementOffline kwpSettlementOffline = new KwpSettlementOffline();
                 kwpSettlementOffline.setId(new IdWorker(NumberConstant.ONE).nextId());

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

@@ -46,7 +46,7 @@ public class KwpSettlementTradeService {
     private RemoteSystemService remoteSystemService;
     private final KwpLedgerTradeUnitService tradeUnitService;
     @Resource
-    private KwpSettlementWalletService settlementWalletService;
+    private KwpSettlementWalletService kwpSettlementWalletService;
 
 
     /**
@@ -259,7 +259,7 @@ public class KwpSettlementTradeService {
         }
         settlementTradeDto.setPercentage(settlementTradeDto.changePercentage(settlementTradeDto.getActualPrice(), settlementTradeDto.getTotalPrice()));
         settlementTradeDto.setStatusLabel(SettlementEnum.getStatusDesc(settlementTradeDto.getStatus()));
-        List<SettlementWalletDto> settlementWallet = settlementWalletService.queryList(id, SettlementOrderTypeEnum.TRADE.getStatus(), TradingEnum.getPrefix(trading));
+        List<SettlementWalletDto> settlementWallet = kwpSettlementWalletService.queryList(id, SettlementOrderTypeEnum.TRADE.getStatus(), TradingEnum.getPrefix(trading));
         return new SettlementDetailDto<>(settlementTradeDto, settlementWallet);
     }
 

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

@@ -22,16 +22,14 @@ import com.sckw.payment.model.KwpWalletRefund;
 import com.sckw.payment.model.KwpWalletTransfer;
 import com.sckw.payment.model.constant.RefundEnum;
 import com.sckw.payment.model.constant.TransferEnum;
+import com.sckw.payment.model.constant.WalletChannelEnum;
 import com.sckw.payment.model.dto.common.BusinessNo;
 import com.sckw.payment.model.dto.page.CashPage;
 import com.sckw.payment.model.dto.page.PrePayWalletPage;
 import com.sckw.payment.model.dto.wallet.*;
 import com.sckw.payment.model.vo.PrePayWalletVo;
 import com.sckw.payment.model.vo.req.*;
-import com.sckw.payment.model.vo.res.ApPageRes;
-import com.sckw.payment.model.vo.res.FundVo;
-import com.sckw.payment.model.vo.res.MorePageRes;
-import com.sckw.payment.model.vo.res.WalletDetail;
+import com.sckw.payment.model.vo.res.*;
 import com.sckw.redis.config.RedisLockUtil;
 import com.sckw.redis.constant.RedisLockKey;
 import com.sckw.system.api.RemoteSystemService;
@@ -48,9 +46,7 @@ import org.springframework.stereotype.Service;
 import java.math.BigDecimal;
 import java.text.DecimalFormat;
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -186,21 +182,110 @@ public class WalletService {
         }
     }
 
+    /**
+     * 按钱包渠道进行统计钱包清单数量
+     *
+     * @param entName
+     * @return
+     */
+    public List<ChannelCount> walletCount(String entName) {
+        Long entId = LoginUserHolder.getEntId();
+        String uid = walletRelationService.getRelation(entId);
+        if (StringUtils.isBlank(uid)) {
+            throw new BusinessException("暂未开通电子钱包");
+        }
+        List<String> filterList = new ArrayList<>();
+        //筛选指定企业的数据
+        if (StringUtils.isNotBlank(entName)) {
+            filterList = findFilter(entName);
+        } else {
+            //筛选所有的
+            filterList.add("");
+        }
+        List<ChannelCount> channelDetails = new ArrayList<>();
+        HashMap<String, Integer> mapCount = new HashMap<>();
+        int all = 0;
+        for (String filter : filterList) {
+            R<List<WalletDto>> wallet = payCenterService.wallet(uid, null, filter);
+            if (wallet.getStatus()) {
+                List<WalletDto> data = wallet.getData();
+                if (!CollectionUtils.isEmpty(data)) {
+                    all += data.size();
+                    Map<String, List<WalletDto>> map = data.stream().collect(Collectors.groupingBy(WalletDto::getChannel));
+                    for (Map.Entry<String, List<WalletDto>> one : map.entrySet()) {
+                        List<WalletDto> value = one.getValue();
+                        Integer size = CollectionUtils.isEmpty(value) ? 0 : value.size();
+                        mapCount.compute(one.getKey(), (k, v) -> Objects.isNull(v) ? size : size + v);
+                    }
+                }
+            }
+        }
+        //所有的
+        mapCount.put(WalletChannelEnum.ALL.getChannel(), all);
+        ChannelCount channelCount;
+        for (WalletChannelEnum value : WalletChannelEnum.values()) {
+            channelCount = new ChannelCount(value.getValue(), value.getDesc(), value.getChannel(), Objects.isNull(mapCount.get(value.getChannel())) ? 0 : mapCount.get(value.getChannel()));
+            channelDetails.add(channelCount);
+        }
+        return channelDetails;
+    }
+
     /**
      * 钱包总览信息
      *
      * @return
      */
-    public WalletDetail walletOverview() {
+    public WalletDetail walletOverview(boolean queryChannel) {
         Long entId = LoginUserHolder.getEntId();
-        String relation = walletRelationService.getRelation(entId);
-        if (StringUtils.isBlank(relation)) {
+        String uid = walletRelationService.getRelation(entId);
+        if (StringUtils.isBlank(uid)) {
             throw new BusinessException("暂未开通电子钱包");
         }
-        R<WalletOverview> wallet = payCenterService.general(relation);
+        R<WalletOverview> wallet = payCenterService.general(uid);
         if (wallet.getStatus()) {
             WalletOverview data = wallet.getData();
-            return new WalletDetail(LoginUserHolder.getEntName(), String.valueOf(data.getTotalMoney() / 100D), String.valueOf(data.getChargingMoney()), String.valueOf(data.getWdingMoney()), data.getChannelTotal(), data.getChannels());
+            List<ChannelDetail> channelDetails = new ArrayList<>();
+            if (queryChannel) {
+                R<List<WalletDto>> wallet1 = payCenterService.wallet(uid, null, "");
+                if (wallet1.getStatus()) {
+                    List<WalletDto> data1 = wallet1.getData();
+                    if (!CollectionUtils.isEmpty(data1)) {
+                        Map<String, List<WalletDto>> map = data1.stream().collect(Collectors.groupingBy(WalletDto::getChannel));
+                        ChannelDetail channelDetail;
+                        for (Map.Entry<String, List<WalletDto>> one : map.entrySet()) {
+                            String key = one.getKey();
+                            List<WalletDto> value = one.getValue();
+                            Long money = 0L;
+                            Long totalMoney = 0L;
+                            if (!CollectionUtils.isEmpty(value)) {
+                                for (WalletDto walletDto : value) {
+                                    money += walletDto.getMoney();
+                                    totalMoney += walletDto.getTotalMoney();
+                                }
+                            }
+                            channelDetail = new ChannelDetail();
+                            channelDetail.setChannel(key);
+                            channelDetail.setMoney(String.valueOf(money / 100D));
+                            channelDetail.setTotalMoney(String.valueOf(totalMoney / 100D));
+                            channelDetails.add(channelDetail);
+                        }
+                    }
+                }
+            } else {
+                List<String> channels = data.getChannels();
+                if (!CollectionUtils.isEmpty(channels)) {
+                    ChannelDetail channelDetail;
+                    for (String channel : channels) {
+                        channelDetail = new ChannelDetail();
+                        channelDetail.setChannel(channel);
+                        channelDetail.setMoney("-");
+                        channelDetail.setTotalMoney("-");
+                        channelDetails.add(channelDetail);
+                    }
+                }
+            }
+            return new WalletDetail(LoginUserHolder.getEntName(), String.valueOf(data.getTotalMoney() / 100D), String.valueOf(data.getChargingMoney()),
+                    String.valueOf(data.getWdingMoney()), data.getChannelTotal(), channelDetails);
         }
         return new WalletDetail(LoginUserHolder.getEntName(), "-", "-", "-", 0, new ArrayList<>());
     }
@@ -214,8 +299,8 @@ public class WalletService {
         log.info("查询资金明细:{}", JSONObject.toJSONString(walletDetailReq));
         Long entId = LoginUserHolder.getEntId();
         //查询我方企业开通的渠道
-        String relation = walletRelationService.getRelation(entId);
-        if (StringUtils.isBlank(relation)) {
+        String uid = walletRelationService.getRelation(entId);
+        if (StringUtils.isBlank(uid)) {
             return PageRes.handPage(walletDetailReq.getPage(), walletDetailReq.getPageSize(), new ArrayList<>());
         }
         ChannelEnum channelEnum = null;
@@ -236,7 +321,7 @@ public class WalletService {
                 return PageRes.handPage(walletDetailReq.getPage(), walletDetailReq.getPageSize(), new ArrayList<>());
             }
             for (String filter : filterList) {
-                R<Wallet> walletR = payCenterService.walletSum(relation, channelEnum, filter);
+                R<Wallet> walletR = payCenterService.walletSum(uid, channelEnum, filter);
                 if (walletR.getStatus()) {
                     Wallet data = walletR.getData();
                     sum += data.getTotalMoney();
@@ -249,7 +334,7 @@ public class WalletService {
             }
         } else {
             //不搜索往来单位
-            R<Wallet> wallet = payCenterService.walletSum(relation, channelEnum, "");
+            R<Wallet> wallet = payCenterService.walletSum(uid, channelEnum, "");
             if (wallet.getStatus()) {
                 Wallet data = wallet.getData();
                 sum += data.getTotalMoney();

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/dubbo/PaymentDubboServiceImpl.java

@@ -36,8 +36,8 @@ import java.util.*;
 public class PaymentDubboServiceImpl implements PaymentDubboService {
     private final KwpLedgerLogisticsService ledgerLogisticsService;
     private final KwpLedgerTradeService kwpLedgerTradeService;
-    private final KwpSettlementLogisticsService settlementLogisticsService;
-    private final KwpSettlementTradeService settlementTradeService;
+    private final KwpSettlementLogisticsService kwpSettlementLogisticsService;
+    private final KwpSettlementTradeService kwpSettlementTradeService;
 
 
     private SettlementMoney change(List<MoneyType> moneyType) {
@@ -74,8 +74,8 @@ public class PaymentDubboServiceImpl implements PaymentDubboService {
         if (Objects.isNull(entId) || Objects.isNull(entTarget)) {
             throw new BusinessException("企业id不能为空");
         }
-        List<String> logistics = settlementLogisticsService.checkOrder(entId, entTarget);
-        List<String> trade = settlementTradeService.checkOrder(entId, entTarget);
+        List<String> logistics = kwpSettlementLogisticsService.checkOrder(entId, entTarget);
+        List<String> trade = kwpSettlementTradeService.checkOrder(entId, entTarget);
         Map<OrderEnum, List<String>> res = new HashMap<>(2);
         res.put(OrderEnum.LOGISTICS, logistics);
         res.put(OrderEnum.TRADE, trade);
@@ -110,7 +110,7 @@ public class PaymentDubboServiceImpl implements PaymentDubboService {
             pre.add(DateTimeUtil.getComputeMonthStart(-2, 1));
             pre.add(DateTimeUtil.getComputeMonthEnd(-1, 0));
         }
-        List<MoneyType> moneyType = settlementTradeService.moneySum(entId, cur, pre, TradeUnitType.SELL);
+        List<MoneyType> moneyType = kwpSettlementTradeService.moneySum(entId, cur, pre, TradeUnitType.SELL);
         return change(moneyType);
     }
 
@@ -134,7 +134,7 @@ public class PaymentDubboServiceImpl implements PaymentDubboService {
             pre.add(DateTimeUtil.getComputeMonthStart(-2, 1));
             pre.add(DateTimeUtil.getComputeMonthEnd(-1, 0));
         }
-        List<MoneyType> moneyType = settlementTradeService.moneySum(entId, cur, pre, TradeUnitType.PURCHASE);
+        List<MoneyType> moneyType = kwpSettlementTradeService.moneySum(entId, cur, pre, TradeUnitType.PURCHASE);
         return change(moneyType);
     }
 
@@ -159,7 +159,7 @@ public class PaymentDubboServiceImpl implements PaymentDubboService {
             pre.add(DateTimeUtil.getComputeMonthStart(-2, 1));
             pre.add(DateTimeUtil.getComputeMonthEnd(-1, 0));
         }
-        List<MoneyType> moneyType = settlementLogisticsService.moneySum(entId, cur, pre, LogisticsUnitType.CARRIER);
+        List<MoneyType> moneyType = kwpSettlementLogisticsService.moneySum(entId, cur, pre, LogisticsUnitType.CARRIER);
         return change(moneyType);
 
     }
@@ -184,7 +184,7 @@ public class PaymentDubboServiceImpl implements PaymentDubboService {
             pre.add(DateTimeUtil.getComputeMonthStart(-2, 1));
             pre.add(DateTimeUtil.getComputeMonthEnd(-1, 0));
         }
-        List<MoneyType> moneyType = settlementLogisticsService.moneySum(entId, cur, pre, LogisticsUnitType.SHIPPER);
+        List<MoneyType> moneyType = kwpSettlementLogisticsService.moneySum(entId, cur, pre, LogisticsUnitType.SHIPPER);
         return change(moneyType);
     }
 }

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/operate/LedgerTradeService.java

@@ -25,11 +25,11 @@ import com.sckw.payment.model.vo.LedgerSell;
 import com.sckw.payment.model.vo.req.LedgerListReq;
 import com.sckw.payment.model.vo.req.TradeReq;
 import com.sckw.payment.model.vo.res.LedgerTradeDetailVo;
-import com.sckw.payment.service.*;
+import com.sckw.payment.service.AbsLedger;
+import com.sckw.payment.service.KwpLedgerTradeOrderService;
 import com.sckw.system.api.RemoteSystemService;
 import com.sckw.system.api.model.dto.res.SysDictResDto;
 import com.sckw.system.api.model.dto.res.UserCacheResDto;
-import jakarta.annotation.Resource;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -49,12 +49,8 @@ import java.util.stream.Collectors;
 @RequiredArgsConstructor
 public class LedgerTradeService extends AbsLedger {
     private final KwpLedgerTradeMapper tradeMapper;
-    private final KwpLedgerTradeTrackService tradeTrackService;
     private final KwpLedgerTradeOrderService tradeOrderService;
-    private final KwpLedgerTradeUnitService tradeUnitService;
-    private final MessageSender messageSender;
-    @Resource
-    private KwpSettlementTradeService settlementTradeService;
+
     @DubboReference(version = "1.0.0", group = "design", check = false)
     private RemoteSystemService remoteSystemService;
     @DubboReference(version = "1.0.0", group = "design", check = false)