From 228082bf44e644572c655a3fac7362891db2587d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Sun, 28 Sep 2025 19:53:47 +0800
Subject: [PATCH] =?UTF-8?q?dubblo=E6=8A=A5=E9=94=99=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../market/service/impl/TbMemberConfigServiceImpl.java   | 9 +++++----
 .../service/order/service/impl/OrderInfoServiceImpl.java | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/TbMemberConfigServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/TbMemberConfigServiceImpl.java
index cf0311ac..8a679882 100644
--- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/TbMemberConfigServiceImpl.java
+++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/TbMemberConfigServiceImpl.java
@@ -472,9 +472,7 @@ public class TbMemberConfigServiceImpl extends ServiceImpl<TbMemberConfigMapper,
         }
 
         shopUser.setMemberName(memberOrder.getName());
-        if (memberOrder.getReward() != null) {
-            deliver(shopId, userId, TableValueConstant.MemberExpFlow.Type.PAY, memberOrder.getPayAmount(), memberOrder.getReward(), memberOrderId);
-        }
+
 
         // 发券流程
         if (StrUtil.isNotBlank(memberOrder.getCouponList())) {
@@ -494,11 +492,14 @@ public class TbMemberConfigServiceImpl extends ServiceImpl<TbMemberConfigMapper,
 
         memberOrder.setStatus(OrderStatusEnums.DONE.getCode());
         memberOrderService.updateById(memberOrder);
+        if (memberOrder.getReward() != null) {
+            deliver(shopId, userId, TableValueConstant.MemberExpFlow.Type.PAY, memberOrder.getPayAmount(), memberOrder.getReward(), memberOrderId);
+        }
         if (shopUser.getMemberLevelId() == null) {
             shopUser.setMemberLevelId(levelConfig.getId());
         }
         shopUser.setIsVip(1);
-        return shopUserService.updateById(shopUser);
+        return shopUserService.updateInfo(shopUser);
     }
 
     @Override
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 d083e039..e6ba0812 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
@@ -824,7 +824,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
         }
         if (StrUtil.isNotBlank(payment.getTradeNumber())) {
             log.info("订单处理过，payment id：{}", payment.getId());
-            return;
+//            return;
         }
         payment.setTradeNumber(czgCallBackDto.getPayOrderId());
         payment.setRespJson(resultJson.toString());