From efdf3092e5dfd39a4db8645b5eae2a3b73651a93 Mon Sep 17 00:00:00 2001 From: 0000 Date: Sun, 15 Jun 2025 17:12:41 +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 --- .../common/service/CommonInfoService.java | 12 ++ .../service/impl/CommonInfoServiceImpl.java | 158 ++++++++++++++++++ .../pay/controller/app/AliPayController.java | 31 +++- .../pay/service/impl/WxServiceImpl.java | 61 ++++++- 4 files changed, 254 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/sqx/modules/common/service/CommonInfoService.java b/src/main/java/com/sqx/modules/common/service/CommonInfoService.java index 4481694..91128e6 100644 --- a/src/main/java/com/sqx/modules/common/service/CommonInfoService.java +++ b/src/main/java/com/sqx/modules/common/service/CommonInfoService.java @@ -3,12 +3,24 @@ package com.sqx.modules.common.service; import com.sqx.common.utils.Result; import com.sqx.modules.common.entity.CommonInfo; +import java.math.BigDecimal; + +import java.math.BigDecimal; + /** * @author fang * @date 2020/7/8 */ public interface CommonInfoService { + /** + * 根据充值金额获取赠送金额 + * @param rechargeAmount 充值金额 + * @return 赠送金额 + */ + BigDecimal getRechargeBonus(BigDecimal rechargeAmount); + + /** * 保存对象 * 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 6094c1d..226abc1 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 @@ -7,18 +7,24 @@ import com.sqx.modules.common.entity.CommonInfo; import com.sqx.modules.common.service.CommonInfoService; import com.sqx.modules.tbCoupon.entity.TbCoupon; import com.sqx.modules.tbCoupon.service.TbCouponService; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.math.BigDecimal; import java.text.SimpleDateFormat; +import java.util.Collections; import java.util.Date; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** * @author fang * @date 2020/7/8 */ +@Slf4j @Service public class CommonInfoServiceImpl extends ServiceImpl implements CommonInfoService { @@ -33,8 +39,93 @@ public class CommonInfoServiceImpl extends ServiceImpl bonusMap = parseRechargeBonusConfig(configValue); + + // 根据充值金额获取赠送金额 + BigDecimal bonus = bonusMap.getOrDefault(rechargeAmount, BigDecimal.ZERO); + return bonus; + } + /** + * 获取支付方式描述 + */ + private String getPayTypeDesc(Integer payType) { + switch (payType) { + case 1: + return "微信"; + case 2: + return "支付宝"; + case 3: + return "工商银行"; + default: + return "未知"; + } + } + + /** + * 解析充值赠送配置 + * @param configValue 配置值，格式为：充值金额:赠送金额,充值金额:赠送金额,... + * @return 充值金额与赠送金额的映射 + */ + private Map parseRechargeBonusConfig(String configValue) { + if (StringUtils.isBlank(configValue)) { + return Collections.emptyMap(); + } + + try { + // 按逗号分割每个配置项 + String[] configItems = configValue.split(","); + Map bonusMap = new java.util.HashMap<>(); + + for (String item : configItems) { + // 检查配置项是否包含冒号 + if (item.contains(":")) { + String[] parts = item.split(":"); + if (parts.length == 2) { + BigDecimal rechargeAmount = new BigDecimal(parts[0].trim()); + BigDecimal bonusAmount = new BigDecimal(parts[1].trim()); + bonusMap.put(rechargeAmount, bonusAmount); + } + } + } + + return bonusMap; + } catch (Exception e) { + // 解析异常时返回空映射 + return Collections.emptyMap(); + } + } } \ No newline at end of file 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 d90897b..9a47cfd 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 @@ -170,8 +170,18 @@ public class AliPayController { //设置订单更新时间 orders.setUpdateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date())); payOrderDao.updateById(orders); - //调用处理接口 - userMoneyDao.updateMayMoney(1, orders.getUserId(), orders.getMoney()); + // 处理充值赠送金额 + BigDecimal bonusAmount = commonInfoService.getRechargeBonus(orders.getPayMoney()); + // 计算总金额（充值金额 + 赠送金额） + BigDecimal totalAmount = orders.getMoney().add(bonusAmount); + + // 一次性更新用户余额（充值金额 + 赠送金额） + userMoneyDao.updateMayMoney(1, orders.getUserId(), totalAmount); + + // 创建交易记录列表 + List detailsList = new ArrayList<>(); + + // 添加充值记录 UserMoneyDetails userMoneyDetails = new UserMoneyDetails(); userMoneyDetails.setUserId(orders.getUserId()); userMoneyDetails.setTitle("支付宝充值"); @@ -180,7 +190,22 @@ public class AliPayController { userMoneyDetails.setMoney(orders.getMoney()); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); userMoneyDetails.setCreateTime(sdf.format(new Date())); - userMoneyDetailsService.save(userMoneyDetails); + detailsList.add(userMoneyDetails); + + // 如果有赠送金额，添加赠送记录 + if (bonusAmount.compareTo(BigDecimal.ZERO) > 0) { + UserMoneyDetails bonusDetails = new UserMoneyDetails(); + bonusDetails.setUserId(orders.getUserId()); + bonusDetails.setTitle("充值赠送"); + bonusDetails.setContent("充值" + orders.getPayMoney() + "元，赠送" + bonusAmount + "元"); + bonusDetails.setType(1); + bonusDetails.setMoney(bonusAmount); + bonusDetails.setCreateTime(sdf.format(new Date())); + detailsList.add(bonusDetails); + } + + // 一次性保存所有交易记录 + userMoneyDetailsService.saveBatch(detailsList); } else if (payDetails.getType() == 2) { Orders orders = ordersDao.selectOne(new QueryWrapper().eq("orders_no", payDetails.getOrderId())); GoodsSku goodsSku = goodsSkuService.getById(orders.getSkuId()); 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 4468c2c..9b20891 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 @@ -512,8 +512,18 @@ public class WxServiceImpl implements WxService { //设置订单更新时间 orders.setUpdateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date())); payOrderDao.updateById(orders); - //调用处理接口 - userMoneyDao.updateMayMoney(1, orders.getUserId(), orders.getMoney()); + // 处理充值赠送金额 + BigDecimal bonusAmount = commonInfoService.getRechargeBonus(orders.getPayMoney()); + // 计算总金额（充值金额 + 赠送金额） + BigDecimal totalAmount = orders.getMoney().add(bonusAmount); + + // 一次性更新用户余额（充值金额 + 赠送金额） + userMoneyDao.updateMayMoney(1, orders.getUserId(), totalAmount); + + // 创建交易记录列表 + List detailsList = new ArrayList<>(); + + // 添加充值记录 UserMoneyDetails userMoneyDetails = new UserMoneyDetails(); userMoneyDetails.setUserId(orders.getUserId()); userMoneyDetails.setTitle("微信充值"); @@ -522,7 +532,22 @@ public class WxServiceImpl implements WxService { userMoneyDetails.setMoney(orders.getMoney()); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); userMoneyDetails.setCreateTime(sdf.format(new Date())); - userMoneyDetailsService.save(userMoneyDetails); + detailsList.add(userMoneyDetails); + + // 如果有赠送金额，添加赠送记录 + if (bonusAmount.compareTo(BigDecimal.ZERO) > 0) { + UserMoneyDetails bonusDetails = new UserMoneyDetails(); + bonusDetails.setUserId(orders.getUserId()); + bonusDetails.setTitle("充值赠送"); + bonusDetails.setContent("充值" + orders.getPayMoney() + "元，赠送" + bonusAmount + "元"); + bonusDetails.setType(1); + bonusDetails.setMoney(bonusAmount); + bonusDetails.setCreateTime(sdf.format(new Date())); + detailsList.add(bonusDetails); + } + + // 一次性保存所有交易记录 + userMoneyDetailsService.saveBatch(detailsList); } else if (payDetails.getType() == 2) { Orders orders = ordersDao.selectOne(new QueryWrapper().eq("orders_no", payDetails.getOrderId())); GoodsSku goodsSku = goodsSkuService.getById(orders.getSkuId()); @@ -837,7 +862,18 @@ public class WxServiceImpl implements WxService { orders.setUpdateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date())); payOrderDao.updateById(orders); //调用处理接口 - userMoneyDao.updateMayMoney(1, orders.getUserId(), orders.getMoney()); + // 处理充值赠送金额 + BigDecimal bonusAmount = commonInfoService.getRechargeBonus(orders.getPayMoney()); + // 计算总金额（充值金额 + 赠送金额） + BigDecimal totalAmount = orders.getMoney().add(bonusAmount); + + // 一次性更新用户余额（充值金额 + 赠送金额） + userMoneyDao.updateMayMoney(1, orders.getUserId(), totalAmount); + + // 创建交易记录列表 + List detailsList = new ArrayList<>(); + + // 添加充值记录 UserMoneyDetails userMoneyDetails = new UserMoneyDetails(); userMoneyDetails.setUserId(orders.getUserId()); userMoneyDetails.setTitle("微信充值"); @@ -846,7 +882,22 @@ public class WxServiceImpl implements WxService { userMoneyDetails.setMoney(orders.getMoney()); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); userMoneyDetails.setCreateTime(sdf.format(new Date())); - userMoneyDetailsService.save(userMoneyDetails); + detailsList.add(userMoneyDetails); + + // 如果有赠送金额，添加赠送记录 + if (bonusAmount.compareTo(BigDecimal.ZERO) > 0) { + UserMoneyDetails bonusDetails = new UserMoneyDetails(); + bonusDetails.setUserId(orders.getUserId()); + bonusDetails.setTitle("充值赠送"); + bonusDetails.setContent("充值" + orders.getPayMoney() + "元，赠送" + bonusAmount + "元"); + bonusDetails.setType(1); + bonusDetails.setMoney(bonusAmount); + bonusDetails.setCreateTime(sdf.format(new Date())); + detailsList.add(bonusDetails); + } + + // 一次性保存所有交易记录 + userMoneyDetailsService.saveBatch(detailsList); } else if (payDetails.getType() == 2) { Orders orders = ordersDao.selectOne(new QueryWrapper().eq("orders_no", payDetails.getOrderId())); GoodsSku goodsSku = goodsSkuService.getById(orders.getSkuId());