From 9236951836d932817f5d284f3d326530fabd1d56 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 14 一月 2025 19:07:19 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/ExpressDeliveryUtil.java | 8 +++++++-
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/WalletServiceImpl.java | 8 +++-----
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/WalletServiceImpl.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/WalletServiceImpl.java
index 65f5425..fe38178 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/WalletServiceImpl.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/WalletServiceImpl.java
@@ -43,17 +43,15 @@
List<WithdrawalRequests> waitAuditList = withdrawalRequestsService.list(new LambdaQueryWrapper<WithdrawalRequests>()
.eq(WithdrawalRequests::getAppUserId, userId)
.eq(WithdrawalRequests::getAuditStatus, WithdrawalAuditStatus.WAIT_AUDIT));
-
+ BigDecimal reduce = waitAuditList.stream().map(WithdrawalRequests::getWithdrawalAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
WalletVO walletVO = new WalletVO();
walletVO.setWithdrawalAmount(appUser.getWithdrawableAmount());
- walletVO.setWithdrawnAmount(appUser.getWithdrawnAmount());
+ walletVO.setWithdrawnAmount(appUser.getWithdrawnAmount().subtract(reduce));
walletVO.setVipWithdrawalMinAmount(data.getVipWithdrawalMinAmount());
walletVO.setTotalRechargeAmount(appUser.getTotalRechargeAmount());
walletVO.setTotalRedPacketAmount(appUser.getTotalRedPacketAmount());
walletVO.setTotalDistributionAmount(appUser.getTotalDistributionAmount());
- walletVO.setAuditAmount(waitAuditList.stream()
- .map(WithdrawalRequests::getWithdrawalAmount)
- .reduce(BigDecimal.ZERO, BigDecimal::add));
+ walletVO.setAuditAmount(reduce);
walletVO.setBalance(appUser.getBalance());
return walletVO;
}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/ExpressDeliveryUtil.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/ExpressDeliveryUtil.java
index 75e2841..699a5e8 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/ExpressDeliveryUtil.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/ExpressDeliveryUtil.java
@@ -75,7 +75,8 @@
public static MapTrackKD100Vo kd100MapTrack(String com, String num, String from, String to){
QueryTrackReq queryTrackReq = new QueryTrackReq();
QueryTrackParam queryTrackParam = new QueryTrackParam();
- queryTrackParam.setCom(CompanyConstant.YD);
+// queryTrackParam.setCom(CompanyConstant.YD);
+ queryTrackParam.setCom(com);
queryTrackParam.setNum(num);
queryTrackParam.setFrom(from);
queryTrackParam.setTo(to);
@@ -99,4 +100,9 @@
return mapTrackKD100Vo;
}
+
+ public static void main(String[] args) {
+ ExpressDeliveryUtil.kd100MapTrack("zhongtong", "75617413683310", "湖南省长沙市", "四川省成都市");
+ }
+
}
--
Gitblit v1.7.1