From b0cce5337128002901a9843d26afecfab685e835 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Sat, 08 Feb 2025 14:20:34 +0800
Subject: [PATCH] refactor(pay): 重构支付回调逻辑并优化支付成功页面 - 重构 FiuuReturnController 中的支付回调逻辑 - 移除未使用的代码和注释 - 优化支付成功页面的 HTML 结构和样式 - 添加返回首页的按钮
---
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