From d390054f072b270aebe3c7b725d2a5fca394a7e6 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:08:11 +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

---
 .../system/cashierservice/service/PayService.java      | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

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 2fe445b..d91214f 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
@@ -1294,7 +1294,7 @@ public class PayService {
      * @param payType    支付平台
      * @param payOrderNO 三方支付订单号
      */
-    private void orderSuccessPay(TbOrderInfo orderInfo, String payType, String payOrderNO) {
+    private void orderSuccessPay(TbOrderInfo orderInfo, String payType, String payOrderNO, boolean isFreeDine) {
         int cartCount = mpCashierCartMapper.update(null, new LambdaUpdateWrapper<TbCashierCart>()
                 .eq(TbCashierCart::getOrderId, orderInfo.getId())
 //                    .eq(TbCashierCart::getUseType, orderInfo.getUseType())
@@ -1322,7 +1322,9 @@ public class PayService {
         tbOrderInfoMapper.updateByPrimaryKeySelective(orderInfo);
 
         // 消费送积分
-        tbMemberPointsService.consumeAwardPoints(Long.valueOf(orderInfo.getMemberId()), Long.valueOf(orderInfo.getId()));
+        if (!isFreeDine) {
+            tbMemberPointsService.consumeAwardPoints(Long.valueOf(orderInfo.getMemberId()), Long.valueOf(orderInfo.getId()));
+        }
 
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("token", 0);
@@ -1386,7 +1388,7 @@ public class PayService {
         }
 
         if ("paying".equals(orderInfo.getStatus())) {
-            orderSuccessPay(orderInfo, payType, payOrderNO);
+            orderSuccessPay(orderInfo, payType, payOrderNO, false);
 
             return "SUCCESS";
 
@@ -1683,7 +1685,7 @@ public class PayService {
                 shopCouponService.use(shopId, orderInfo.getId(), Integer.valueOf(orderInfo.getUserId()), activateOutRecords);
             }
             // 更改订单状态
-            orderSuccessPay(orderInfo, payType, payOrderNo);
+            orderSuccessPay(orderInfo, payType, payOrderNo, true);
 
             // 更改霸王餐记录
 //            TbFreeDineRecord freeDineRecord = freeDineRecordService.selectByOrderId(orderInfo.getId());