From 2d25f8ca6ee3ebcdaa572169b2c478d23f6bd053 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 17 Jun 2022 17:44:28 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberWalletServiceImpl.java | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 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 7dca4fb..63a5806 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
@@ -19,6 +19,7 @@
import java.lang.reflect.Field;
import java.math.BigDecimal;
+import java.util.Map;
/**
* @author wzy
@@ -169,7 +170,15 @@
}
@Override
- public void reduce(BigDecimal amount, Long memberId, String field) {
+ public void add(BigDecimal amount, Long memberId, String... field) {
+ String[] fields = field.clone();
+ for (String s : fields) {
+ add(amount, memberId, s);
+ }
+ }
+
+ @Override
+ public int reduce(BigDecimal amount, Long memberId, String field, Map<String, BigDecimal> map) {
int i = 0;
boolean flag = true;
@@ -187,7 +196,17 @@
BigDecimal balance = (BigDecimal) declaredField.get(wallet);
if (amount.compareTo(balance) > 0) {
- throw new FebsException("余额不足");
+ // 判断 赠送积分，如果剩下赠送积分不等于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));
@@ -204,6 +223,12 @@
}
}
}
+ return 1;
+ }
+
+ @Override
+ public int reduce(BigDecimal amount, Long memberId, String field) {
+ return reduce(amount, memberId, field, null);
}
@Override
--
Gitblit v1.9.1