From 9265a439968f7df5b93a9435f2dc958d8a9c45a3 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Fri, 16 May 2025 16:20:38 +0800
Subject: [PATCH] refactor(mall): 重构充值相关代码
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberWalletServiceImpl.java | 52 ++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 46 insertions(+), 6 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberWalletServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberWalletServiceImpl.java
index 96f94e6..6369962 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberWalletServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberWalletServiceImpl.java
@@ -2,8 +2,10 @@
import cc.mrbird.febs.common.enumerates.FlowTypeEnum;
import cc.mrbird.febs.common.enumerates.MoneyFlowTypeEnum;
+import cc.mrbird.febs.common.enumerates.ScoreFlowTypeEnum;
import cc.mrbird.febs.common.exception.FebsException;
import cc.mrbird.febs.common.utils.LoginUserUtil;
+import cc.mrbird.febs.common.utils.MallUtils;
import cc.mrbird.febs.mall.dto.CommissionChangeDto;
import cc.mrbird.febs.mall.entity.MallMember;
import cc.mrbird.febs.mall.entity.MallMemberWallet;
@@ -19,6 +21,7 @@
import java.lang.reflect.Field;
import java.math.BigDecimal;
+import java.util.Map;
/**
* @author wzy
@@ -177,7 +180,7 @@
}
@Override
- public void reduce(BigDecimal amount, Long memberId, String field) {
+ public int reduce(BigDecimal amount, Long memberId, String field, Map<String, BigDecimal> map) {
int i = 0;
boolean flag = true;
@@ -195,7 +198,21 @@
BigDecimal balance = (BigDecimal) declaredField.get(wallet);
if (amount.compareTo(balance) > 0) {
- throw new FebsException("余额不足");
+ if (map == null) {
+ return 2;
+ }
+
+ // 判断 赠送积分，如果剩下赠送积分不等于0且小于amount, 则扣除所有赠送积分
+ if ("score".equals(field)) {
+ if (balance.compareTo(BigDecimal.ZERO) == 0) {
+ return 2;
+ }
+
+ amount = balance;
+ map.put("amount", amount);
+ } else {
+ return 2;
+ }
}
declaredField.set(update, balance.subtract(amount));
@@ -212,6 +229,12 @@
}
}
}
+ return 1;
+ }
+
+ @Override
+ public int reduce(BigDecimal amount, Long memberId, String field) {
+ return reduce(amount, memberId, field, null);
}
@Override
@@ -227,20 +250,37 @@
// 佣金转余额
if (commissionChange.getType() == 1) {
- type = MoneyFlowTypeEnum.COMMISSION_TO_BALANCE.getValue();
+ type = ScoreFlowTypeEnum.COMMISSION_TO_BALANCE.getValue();
flowType = FlowTypeEnum.BALANCE.getValue();
this.add(commissionChange.getAmount(), member.getId(), "balance");
// 佣金转竞猜积分
} else if (commissionChange.getType() == 2){
- type = MoneyFlowTypeEnum.COMMISSION_TO_PRIZESCORE.getValue();
+ type = ScoreFlowTypeEnum.COMMISSION_TO_PRIZE_SCORE.getValue();
flowType = FlowTypeEnum.PRIZE_SCORE.getValue();
this.add(commissionChange.getAmount(), member.getId(), "prizeScore");
} else {
throw new FebsException("参数错误");
}
- moneyFlowService.addMoneyFlow(member.getId(), commissionChange.getAmount().negate(), type, null, FlowTypeEnum.COMMISSION.getValue());
- moneyFlowService.addMoneyFlow(member.getId(), commissionChange.getAmount(), type, null, flowType);
+ moneyFlowService.addMoneyFlow(
+ member.getId(),
+ commissionChange.getAmount().negate(),
+ type,
+ MallUtils.getOrderNum(),
+ FlowTypeEnum.COMMISSION.getValue(),
+ String.format(ScoreFlowTypeEnum.getDescByValue(type), commissionChange.getAmount()),
+ 2
+ );
+
+ moneyFlowService.addMoneyFlow(
+ member.getId(),
+ commissionChange.getAmount(),
+ type,
+ MallUtils.getOrderNum(),
+ flowType,
+ String.format(ScoreFlowTypeEnum.getDescByValue(type), commissionChange.getAmount()),
+ 2
+ );
}
}
--
Gitblit v1.9.1