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 bonusMap = parseRechargeBonusConfig(configValue); + log.info("bonusMap final:{}", bonusMap); + + + BigDecimal bonus = BigDecimal.ZERO; + for (Map.Entry 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 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);