From 5c5589c0d343437275563a1a84f3a415a4ea16d3 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 17 Jun 2022 16:50:40 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberWalletServiceImpl.java | 20 ++++++++++++++++++--
1 files changed, 18 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 1221e3b..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
@@ -177,7 +178,7 @@
}
@Override
- public int 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 +196,17 @@
BigDecimal balance = (BigDecimal) declaredField.get(wallet);
if (amount.compareTo(balance) > 0) {
- 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));
@@ -216,6 +227,11 @@
}
@Override
+ public int reduce(BigDecimal amount, Long memberId, String field) {
+ return reduce(amount, memberId, field, null);
+ }
+
+ @Override
@Transactional(rollbackFor = Exception.class)
public void commissionChange(CommissionChangeDto commissionChange) {
MallMember member = LoginUserUtil.getLoginUser();
--
Gitblit v1.9.1