From 60949dfa906d1bca39a61a4d88483891be0750d2 Mon Sep 17 00:00:00 2001
From: yang <2119157836@qq.com>
Date: Mon, 31 Mar 2025 16:21:26 +0800
Subject: [PATCH] =?UTF-8?q?refactor(mcwl-pay):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=BA=A4=E6=98=93=E6=9C=8D=E5=8A=A1=E5=92=8C?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=94=AF=E4=BB=98=E8=B4=A6=E6=88=B7=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E6=9C=8D=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mcwl/pay/service/impl/OrderTradeServiceImpl.java   | 10 ++--------
 .../service/impl/SysUserPayAccountLogServiceImpl.java  |  3 ++-
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/mcwl-pay/src/main/java/com/mcwl/pay/service/impl/OrderTradeServiceImpl.java b/mcwl-pay/src/main/java/com/mcwl/pay/service/impl/OrderTradeServiceImpl.java
index b9f4904..a5c62c4 100644
--- a/mcwl-pay/src/main/java/com/mcwl/pay/service/impl/OrderTradeServiceImpl.java
+++ b/mcwl-pay/src/main/java/com/mcwl/pay/service/impl/OrderTradeServiceImpl.java
@@ -703,16 +703,10 @@ public class OrderTradeServiceImpl extends ServiceImpl<OrderTradeMapper, OrderTr
             redisCache.setCacheObject(CommissionRationEnum.COMMISSION_RATION_INVITER_USER.getName(), commissionRationInviterUser);
         }
 
-        Double rationMerchant = redisCache.getCacheObject(CommissionRationMerchant);
-        Double rationInviterUser = redisCache.getCacheObject(commissionRationInviterUser);
-
-        rationMerchant = rationMerchant == null ? 0.0 : rationMerchant;
-        rationInviterUser = rationInviterUser == null ? 0.0 : rationInviterUser;
-
         // 将模型价格、抽取商家金额比例、佣金配给邀请者用户比例转换为BigDecimal类型
         BigDecimal priceBigDecimal = new BigDecimal(price.toString());
-        BigDecimal rationMerchantBigDecimal = new BigDecimal(rationMerchant.toString());
-        BigDecimal rationInviterUserBigDecimal = new BigDecimal(rationInviterUser.toString());
+        BigDecimal rationMerchantBigDecimal = new BigDecimal(CommissionRationMerchant);
+        BigDecimal rationInviterUserBigDecimal = new BigDecimal(commissionRationInviterUser);
 
         // 邀请人获取的金额 = 模型价格 * 抽取商家金额比例 * 邀请人提成比例
         BigDecimal inviterUserAmount = priceBigDecimal
diff --git a/mcwl-system/src/main/java/com/mcwl/system/service/impl/SysUserPayAccountLogServiceImpl.java b/mcwl-system/src/main/java/com/mcwl/system/service/impl/SysUserPayAccountLogServiceImpl.java
index a9c762f..8b61a71 100644
--- a/mcwl-system/src/main/java/com/mcwl/system/service/impl/SysUserPayAccountLogServiceImpl.java
+++ b/mcwl-system/src/main/java/com/mcwl/system/service/impl/SysUserPayAccountLogServiceImpl.java
@@ -40,7 +40,8 @@ public class SysUserPayAccountLogServiceImpl extends ServiceImpl<SysUserPayAccou
         Page<SysUserPayAccountLog> page = new Page<>(withdrawalPageRes.getPageNum(), withdrawalPageRes.getPageSize());
 
         baseMapper.selectPage(page, new LambdaQueryWrapper<SysUserPayAccountLog>()
-                .select(SysUserPayAccountLog::getAmount, SysUserPayAccountLog::getAccount, SysUserPayAccountLog::getCreateTime)
+                .select(SysUserPayAccountLog::getAmount, SysUserPayAccountLog::getAccount,
+                        SysUserPayAccountLog::getWallet, SysUserPayAccountLog::getCreateTime)
                 .eq(SysUserPayAccountLog::getUserId, userId)
                 .orderByDesc(SysUserPayAccountLog::getCreateTime));