From 7c2c2435ae5d5443593e260177d28dcc990ddea4 Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Tue, 20 Dec 2022 14:49:41 +0800 Subject: [PATCH] 20221220 1、会员注册后level为会员 2、代理每天一点更新一次定时器 3、确认收货后返还订单金额,并且产生其余补贴 --- 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