From 9add2e76432dae095ef9000fedacf910c82589b6 Mon Sep 17 00:00:00 2001
From: 0000 <a0000@0000deMacBook-Pro.local>
Date: Mon, 16 Jun 2025 23:42:46 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=85=85=E5=80=BC=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=EF=BC=8C=E5=8F=AF=E9=85=8D=E7=BD=AE=E5=85=85?=
 =?UTF-8?q?=E5=80=BC=E5=A4=9A=E5=B0=91=E9=80=81=E5=A4=9A=E5=B0=91=EF=BC=88?=
 =?UTF-8?q?=E5=9F=BA=E4=BA=8E=E7=9B=AE=E5=89=8D=E7=9A=84=E5=BC=80=E5=8F=91?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/CommonInfoServiceImpl.java   | 20 ++++++++++++++-----
 .../pay/controller/app/AliPayController.java  |  2 +-
 .../pay/service/impl/WxServiceImpl.java       |  9 ++++++---
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/sqx/modules/common/service/impl/CommonInfoServiceImpl.java b/src/main/java/com/sqx/modules/common/service/impl/CommonInfoServiceImpl.java
index 226abc1..a2817ed 100644
--- a/src/main/java/com/sqx/modules/common/service/impl/CommonInfoServiceImpl.java
+++ b/src/main/java/com/sqx/modules/common/service/impl/CommonInfoServiceImpl.java
@@ -174,19 +174,29 @@ public class CommonInfoServiceImpl extends ServiceImpl<CommonInfoDao, CommonInfo
     @Override
     public BigDecimal getRechargeBonus(BigDecimal rechargeAmount) {
         // 获取充值赠送配置（type=279）
+        log.info("rechargeAmount：{}", rechargeAmount);
         CommonInfo rechargeConfig = commonInfoDao.findOne(279);
+        log.info("获取充值赠送配置：{}", rechargeConfig);
         if (rechargeConfig == null || StringUtils.isBlank(rechargeConfig.getValue())) {
+            log.info("StringUtils.isBlank final：{}", StringUtils.isBlank(rechargeConfig.getValue()),rechargeConfig.getValue());
             return BigDecimal.ZERO;
         }
 
-        // 解析充值赠送配置
-        // 格式为：充值金额:赠送金额,充值金额:赠送金额,...
-        // 例如：100:10,200:20,500:50,...
+
         String configValue = rechargeConfig.getValue();
         Map<BigDecimal, BigDecimal> bonusMap = parseRechargeBonusConfig(configValue);
+        log.info("bonusMap final：{}", bonusMap);
+        
+
+        BigDecimal bonus = BigDecimal.ZERO;
+        for (Map.Entry<BigDecimal, BigDecimal> entry : bonusMap.entrySet()) {
+            if (entry.getKey().compareTo(rechargeAmount) == 0) {
+                bonus = entry.getValue();
+                break;
+            }
+        }
+        log.info("get rechargeAmount final：{}", bonus);
 
-        // 根据充值金额获取赠送金额
-        BigDecimal bonus = bonusMap.getOrDefault(rechargeAmount, BigDecimal.ZERO);
         return bonus;
     }
     /**
diff --git a/src/main/java/com/sqx/modules/pay/controller/app/AliPayController.java b/src/main/java/com/sqx/modules/pay/controller/app/AliPayController.java
index 9a47cfd..65dea60 100644
--- a/src/main/java/com/sqx/modules/pay/controller/app/AliPayController.java
+++ b/src/main/java/com/sqx/modules/pay/controller/app/AliPayController.java
@@ -171,7 +171,7 @@ public class AliPayController {
                             orders.setUpdateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
                             payOrderDao.updateById(orders);
                             // 处理充值赠送金额
-                            BigDecimal bonusAmount = commonInfoService.getRechargeBonus(orders.getPayMoney());
+                            BigDecimal bonusAmount = commonInfoService.getRechargeBonus(orders.getMoney());
                             // 计算总金额（充值金额 + 赠送金额）
                             BigDecimal totalAmount = orders.getMoney().add(bonusAmount);
                             
diff --git a/src/main/java/com/sqx/modules/pay/service/impl/WxServiceImpl.java b/src/main/java/com/sqx/modules/pay/service/impl/WxServiceImpl.java
index 9b20891..48ac886 100644
--- a/src/main/java/com/sqx/modules/pay/service/impl/WxServiceImpl.java
+++ b/src/main/java/com/sqx/modules/pay/service/impl/WxServiceImpl.java
@@ -513,7 +513,9 @@ public class WxServiceImpl implements WxService {
                                 orders.setUpdateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
                                 payOrderDao.updateById(orders);
                                 // 处理充值赠送金额
-                                BigDecimal bonusAmount = commonInfoService.getRechargeBonus(orders.getPayMoney());
+                                BigDecimal bonusAmount = commonInfoService.getRechargeBonus(orders.getMoney());
+                                log.info("get bonusAmount：{}", bonusAmount);
+
                                 // 计算总金额（充值金额 + 赠送金额）
                                 BigDecimal totalAmount = orders.getMoney().add(bonusAmount);
                                 
@@ -522,7 +524,8 @@ public class WxServiceImpl implements WxService {
                                 
                                 // 创建交易记录列表
                                 List<UserMoneyDetails> detailsList = new ArrayList<>();
-                                
+                                log.info("get totalAmount：{}", bonusAmount);
+
                                 // 添加充值记录
                                 UserMoneyDetails userMoneyDetails = new UserMoneyDetails();
                                 userMoneyDetails.setUserId(orders.getUserId());
@@ -863,7 +866,7 @@ public class WxServiceImpl implements WxService {
                             payOrderDao.updateById(orders);
                             //调用处理接口
                             // 处理充值赠送金额
-                            BigDecimal bonusAmount = commonInfoService.getRechargeBonus(orders.getPayMoney());
+                            BigDecimal bonusAmount = commonInfoService.getRechargeBonus(orders.getMoney());
                             // 计算总金额（充值金额 + 赠送金额）
                             BigDecimal totalAmount = orders.getMoney().add(bonusAmount);