From 6c4da6d5a90d959707730420523c374a325ac904 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Wed, 12 Mar 2025 15:13:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E5=91=98=E5=85=85=E5=80=BC=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../order/service/impl/OrderInfoServiceImpl.java       | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
index 23dcfcb0..31e386a0 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
@@ -535,7 +535,12 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                     } else {
                         shopUserMoneyEditDTO.setBizEnum(ShopUserFlowBizEnum.CASH_IN);
                     }
+                    //更新会员余额 并生成流水
+                    Long flowId = shopUserService.updateMoney(shopUser.getShopId(), shopUserMoneyEditDTO);
                     String extParam = czgCallBackDto.getExtParam();
+                    if (StrUtil.isBlank(extParam)) {
+                        return;
+                    }
                     JSONObject jsonObject = JSONObject.parseObject(extParam);
                     if (isFree) {
                         if (StrUtil.isBlank(jsonObject.getString("orderId"))) {
@@ -547,10 +552,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                                 .set(OrderInfo::getIsFreeDine, 1)
                                 .set(OrderInfo::getPayAmount, 0)
                                 .update();
-                    }
-                    //更新会员余额 并生成流水
-                    Long flowId = shopUserService.updateMoney(shopUser.getShopId(), shopUserMoneyEditDTO);
-                    if (!isFree) {
+                    } else {
                         //会员活动
                         activateService.giveActivate(shopUser, new BigDecimal(czgCallBackDto.getAmount()).divide(new BigDecimal(100), 2, RoundingMode.DOWN),
                                 StrUtil.isNotBlank(jsonObject.getString("activateId")) ? jsonObject.getLong("activateId") : null, flowId);