From b76f1f562021b8ba30a8535f8a833294cc26fb78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Sat, 23 Nov 2024 16:00:09 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=9C=B8=E7=8E=8B=E9=A4=90=E4=B8=8D?=
 =?UTF-8?q?=E9=80=81=E5=88=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chaozhanggui/system/cashierservice/service/PayService.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
index 9671cf8..2fe445b 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
@@ -1743,11 +1743,12 @@ public class PayService {
         checkFreeDineForMemberInCallBack(memberIn, payType, payOrderNO);
 
         //会员活动
-        BigDecimal awardAmount = giveActivate(tbShopUser, memberIn.getAmount(), flow.getId());
+        BigDecimal awardAmount = null;
 
         //充值送积分
         TbActivate activate = tbActivateMapper.selectByAmountScope(tbShopUser.getShopId(), memberIn.getAmount());
         if (memberIn.getOrderId() == null && ObjectUtil.isNotNull(activate)) {
+            awardAmount = giveActivate(tbShopUser, memberIn.getAmount(), flow.getId());
             tbMemberPointsService.addPoints(Convert.toLong(tbShopUser.getId()), activate.getGiftPoints(), StrUtil.format("充值￥{}送{}积分", memberIn.getAmount(), activate.getGiftPoints()), null, memberIn.getOrderNo());
         }
         JSONObject jsonObject = new JSONObject();