From 7487e028b0d8a5bb5d3e0a8f4acd93b32736184e Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Mon, 29 Sep 2025 16:20:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E8=8E=B7=E5=8F=96=E5=88=B0=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../czg/order/service/OrderInfoService.java   |  3 ++
 .../service/order/mapper/OrderInfoMapper.java |  2 +
 .../service/impl/OrderInfoServiceImpl.java    | 49 +++++++++++--------
 .../order/service/impl/PayServiceImpl.java    | 15 ++----
 .../main/resources/mapper/OrderInfoMapper.xml |  8 +++
 5 files changed, 45 insertions(+), 32 deletions(-)

diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/service/OrderInfoService.java b/cash-common/cash-common-service/src/main/java/com/czg/order/service/OrderInfoService.java
index 9a865c65..1777761c 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/order/service/OrderInfoService.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/order/service/OrderInfoService.java
@@ -59,4 +59,7 @@ public interface OrderInfoService extends IService<OrderInfo> {
     Boolean cancelledOrder(Long shopId, Long orderId);
 
     Boolean cancelledPlaceOrder(Long shopId, Long orderId, Integer placeNum);
+
+
+    Boolean updatePayOrderId(Long shopId, Long orderId, String  payType);
 }
diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/mapper/OrderInfoMapper.java b/cash-service/order-service/src/main/java/com/czg/service/order/mapper/OrderInfoMapper.java
index 9eb46c80..6676d80a 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/mapper/OrderInfoMapper.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/mapper/OrderInfoMapper.java
@@ -139,4 +139,6 @@ public interface OrderInfoMapper extends BaseMapper<OrderInfo> {
     List<HandoverCategoryListVo> getHandoverCategoryList(Long shopId, String loginTime, String handoverTime);
 
     int decrMoney(@Param("id") Long id, @Param("amount") BigDecimal amount);
+
+    int updatePayOrderId(@Param("shopId") Long shopId, @Param("orderId") Long orderId, @Param("payType") String payType);
 }
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 bc01d2f7..874cb9f9 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
@@ -864,27 +864,27 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                                 .set(OrderInfo::getIsFreeDine, 1)
                                 .set(OrderInfo::getPayAmount, 0)
                                 .update();
-                    }
-
-                    shopRechargeService.recharge(payment.getShopId(), payment.getSourceId(), payment.getRelatedId(),
-                            BigDecimal.valueOf(czgCallBackDto.getAmount()).divide(BigDecimal.valueOf(100)), payment.getId(), payment.getPayType(), bizEnum);
-                    //充值并支付 ↓
-                    OrderInfo orderInfo = getOne(new QueryWrapper()
-                            .eq(OrderInfo::getPayOrderId, payment.getRelatedId())
-                            .eq(OrderInfo::getPayType, PayEnums.VIP_PAY.getValue()));
-                    if (orderInfo != null) {
-                        updateChain().eq(OrderInfo::getPayOrderId, payment.getRelatedId())
-                                .eq(OrderInfo::getPayType, PayEnums.VIP_PAY.getValue())
-                                .set(OrderInfo::getStatus, OrderStatusEnums.DONE.getCode())
-                                .set(OrderInfo::getPayAmount, 0)
-                                .update();
-                        ShopUserMoneyEditDTO shopUserMoneyEditDTO = new ShopUserMoneyEditDTO()
-                                .setId(shopUser.getId())
-                                .setType(0)
-                                .setBizEnum(ShopUserFlowBizEnum.ORDER_PAY)
-                                .setRelationId(orderInfo.getId())
-                                .setMoney(orderInfo.getOrderAmount());
-                        shopUserService.updateMoney(shopUserMoneyEditDTO);
+                    } else {
+                        shopRechargeService.recharge(payment.getShopId(), payment.getSourceId(), payment.getRelatedId(),
+                                BigDecimal.valueOf(czgCallBackDto.getAmount()).divide(BigDecimal.valueOf(100)), payment.getId(), payment.getPayType(), bizEnum);
+                        //充值并支付 ↓
+                        OrderInfo orderInfo = getOne(new QueryWrapper()
+                                .eq(OrderInfo::getPayOrderId, payment.getId())
+                                .eq(OrderInfo::getPayType, PayEnums.VIP_PAY.getValue()));
+                        if (orderInfo != null) {
+                            updateChain().eq(OrderInfo::getPayOrderId, payment.getRelatedId())
+                                    .eq(OrderInfo::getPayType, PayEnums.VIP_PAY.getValue())
+                                    .set(OrderInfo::getStatus, OrderStatusEnums.DONE.getCode())
+                                    .set(OrderInfo::getPayAmount, 0)
+                                    .update();
+                            ShopUserMoneyEditDTO shopUserMoneyEditDTO = new ShopUserMoneyEditDTO()
+                                    .setId(shopUser.getId())
+                                    .setType(0)
+                                    .setBizEnum(ShopUserFlowBizEnum.ORDER_PAY)
+                                    .setRelationId(orderInfo.getId())
+                                    .setMoney(orderInfo.getOrderAmount());
+                            shopUserService.updateMoney(shopUserMoneyEditDTO);
+                        }
                     }
                 }
             } else if ("memberPay".equals(payment.getPayType())) {
@@ -1380,4 +1380,11 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
         }
         return true;
     }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean updatePayOrderId(Long shopId, Long orderId, String  payType) {
+        mapper.updatePayOrderId(shopId, orderId, payType);
+        return true;
+    }
 }
diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java
index d5da9ef2..f310f3f4 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java
@@ -834,17 +834,10 @@ public class PayServiceImpl implements PayService {
     }
 
     private void upOrderPayInfo(@NonNull Long orderId, @NonNull PayEnums payType, @NotBlank Long paymentId) {
-        OrderInfo orderInfo = new OrderInfo();
-        orderInfo.setId(orderId);
-        orderInfo.setPayType(payType.getValue());
-        orderInfo.setPayOrderId(paymentId);
-        orderInfoService.updateById(orderInfo, true);
-
-//        orderInfoService.updateChain()
-//                .set(OrderInfo::getPayOrderId, paymentId)
-//                .set(OrderInfo::getPayType, payType.getValue())
-//                .where(OrderInfo::getId).eq(orderId)
-//                .update();
+        if (paymentId == null) {
+            throw new CzgException("未获取到支付记录");
+        }
+        orderInfoService.updatePayOrderId(orderId, paymentId, payType.getValue());
     }
 
 
diff --git a/cash-service/order-service/src/main/resources/mapper/OrderInfoMapper.xml b/cash-service/order-service/src/main/resources/mapper/OrderInfoMapper.xml
index 62c155a4..202fca30 100644
--- a/cash-service/order-service/src/main/resources/mapper/OrderInfoMapper.xml
+++ b/cash-service/order-service/src/main/resources/mapper/OrderInfoMapper.xml
@@ -34,6 +34,14 @@
         update tb_order_info set origin_amount = origin_amount-#{amount}, update_time=now() where id=#{id} and origin_amount-#{amount} >= 0;
     </update>
 
+    <update id="updatePayOrderId">
+        update tb_order_info
+        set pay_order_id = #{payOrderId},
+            pay_type     = #{payType},
+            update_time=now()
+        where id = #{orderId};
+    </update>
+
     <select id="getHandoverCashAmount" resultType="java.math.BigDecimal">
         SELECT
         ifnull(sum(t1.pay_amount),0)