From 7a0e0f1343e5e44474ae64dd756bb7e9740ba3ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Thu, 21 Nov 2024 16:26:51 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=9C=B8=E7=8E=8B=E9=A4=90=E5=85=85?=
 =?UTF-8?q?=E5=80=BC=E4=B8=8D=E9=80=81=E7=A7=AF=E5=88=86?=
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 0b6a90b..80cafb6 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
@@ -1630,6 +1630,7 @@ public class PayService {
      * @param payOrderNo 三方交易订单号
      */
     private void checkFreeDineForMemberInCallBack(TbMemberIn memberIn, String payType, String payOrderNo) {
+        log.info("校验是否为霸王餐充值回调");
         // 判断是否是霸王餐充值活动
         if (memberIn.getOrderId() != null) {
             TbOrderInfo orderInfo = mpOrderInfoMapper.selectById(memberIn.getOrderId());
@@ -1724,7 +1725,7 @@ public class PayService {
 
         //充值送积分
         TbActivate activate = tbActivateMapper.selectByAmountScope(tbShopUser.getShopId(), memberIn.getAmount());
-        if (ObjectUtil.isNotNull(activate)) {
+        if (memberIn.getOrderId() == null && ObjectUtil.isNotNull(activate)) {
             tbMemberPointsService.addPoints(Convert.toLong(tbShopUser.getId()), activate.getGiftPoints(), StrUtil.format("充值￥{}送{}积分", memberIn.getAmount(), activate.getGiftPoints()), null, memberIn.getOrderNo());
         }
         JSONObject jsonObject = new JSONObject();