From 32f50f003bd07988355eb9cf107ae877ab765b67 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 16:48:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E5=91=98=E5=9B=9E=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/czg/controller/NotifyController.java  |  1 +
 .../service/impl/TbMemberConfigServiceImpl.java    | 14 +++++++++-----
 .../order/service/impl/OrderInfoServiceImpl.java   | 12 +++++-------
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/cash-api/order-server/src/main/java/com/czg/controller/NotifyController.java b/cash-api/order-server/src/main/java/com/czg/controller/NotifyController.java
index 76ba0155..45629a4a 100644
--- a/cash-api/order-server/src/main/java/com/czg/controller/NotifyController.java
+++ b/cash-api/order-server/src/main/java/com/czg/controller/NotifyController.java
@@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.*;
 import java.util.Date;
 
 /**
+ * 回调
  * @author ww
  * @description
  */
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 d40e7d08..9a80e2da 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
@@ -418,7 +418,7 @@ public class TbMemberConfigServiceImpl extends ServiceImpl<TbMemberConfigMapper,
     @Transactional(rollbackFor = Exception.class)
     public boolean joinMember(Long shopId, Long userId, Long memberOrderId) {
         MemberConfigVO memberConfigVO = detail(shopId);
-        ShopUser shopUser = shopUserService.getOne(new QueryWrapper().eq(ShopUser::getSourceShopId, shopId).eq(ShopUser::getUserId, userId));
+        ShopUser shopUser = shopUserService.getShopUserInfo(shopId, userId);
         if (shopUser == null) {
             log.warn("用户不存在, 店铺id: {}, 用户id: {}", shopId, userId);
             return false;
@@ -474,10 +474,14 @@ public class TbMemberConfigServiceImpl extends ServiceImpl<TbMemberConfigMapper,
         // 发券流程
         if (StrUtil.isNotBlank(memberOrder.getCouponList())) {
             JSONArray.parseArray(memberOrder.getCouponList()).toJavaList(MemberConfigDTO.ConfigCoupon.class).forEach(item -> {
-                shopCouponRecordService.grant(shopId, new MkRewardCouponDTO().setCouponId(item.getCoupon().getId())
-                        .setNum(item.getNum())
-                        .setUserId(shopUser.getUserId())
-                        .setShopId(shopId));
+                try {
+                    shopCouponRecordService.grant(shopId, new MkRewardCouponDTO().setCouponId(item.getCoupon().getId())
+                            .setNum(item.getNum())
+                            .setUserId(shopUser.getUserId())
+                            .setShopId(shopId));
+                } catch (Exception e) {
+                    log.error("发券失败", e);
+                }
 
             });
         }
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 ac60c206..fa683754 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
@@ -808,7 +808,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
     @Transactional
     public void payCallBackOrder(@NotBlank String orderNo, @NotNull JSONObject resultJson, int retryCount) {
         CzgPayNotifyDTO czgCallBackDto = JSONObject.parseObject(resultJson.toString(), CzgPayNotifyDTO.class);
-        OrderPayment payment = paymentService.queryChain().eq(OrderPayment::getOrderNo, orderNo).one();
+        OrderPayment payment = paymentService.getOne(new QueryWrapper().eq(OrderPayment::getOrderNo, orderNo));
         if (payment == null) {
             if (retryCount < MAX_RETRIES) {
                 log.info("支付记录不存在，第 {} 次重试，将在 {} 秒后进行", retryCount + 1, DELAY);
@@ -820,13 +820,11 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
         }
         if (StrUtil.isNotBlank(payment.getTradeNumber())) {
             log.info("订单处理过，payment id：{}", payment.getId());
-            return;
+//            return;
         }
-        paymentService.updateChain()
-                .set(OrderPayment::getTradeNumber, czgCallBackDto.getPayOrderId())
-                .set(OrderPayment::getRespJson, resultJson.toString())
-                .where(OrderPayment::getId).eq(payment.getId())
-                .update();
+        payment.setTradeNumber( czgCallBackDto.getPayOrderId());
+        payment.setRespJson(resultJson.toString());
+        paymentService.updateById(payment);
 
         if ("TRADE_SUCCESS".equals(czgCallBackDto.getState())) {
             if ("order".equals(payment.getPayType())) {