From 0764681375ac65351a24208432056bad5702ff19 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 17 Jun 2022 18:01:34 +0800
Subject: [PATCH] Merge branch 'mall-amz' of http://120.27.238.55:7000/r/xc-mall into mall-amz
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberWalletServiceImpl.java | 4 ++++
1 files changed, 4 insertions(+), 0 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 63a5806..92b12d7 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
@@ -196,6 +196,10 @@
BigDecimal balance = (BigDecimal) declaredField.get(wallet);
if (amount.compareTo(balance) > 0) {
+ if (map == null) {
+ return 2;
+ }
+
// 判断 赠送积分，如果剩下赠送积分不等于0且小于amount, 则扣除所有赠送积分
if ("score".equals(field)) {
if (balance.compareTo(BigDecimal.ZERO) == 0) {
--
Gitblit v1.9.1