From 1fc8fde81cbf79ebe95e927f9099cf94c2ccc6e5 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 15 May 2025 17:39:04 +0800
Subject: [PATCH] refactor(mall): 优化退款流程和逻辑

---
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberWalletServiceImpl.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 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 457893e..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) {
@@ -228,7 +232,7 @@
 
     @Override
     public int reduce(BigDecimal amount, Long memberId, String field) {
-        return reduce(amount, memberId, field);
+        return reduce(amount, memberId, field, null);
     }
 
     @Override

--
Gitblit v1.9.1