From 803836b6156fa021bbf62a1f6cde928b22b29dc0 Mon Sep 17 00:00:00 2001
From: gaoqr <13665037151@163.com>
Date: Wed, 15 Oct 2025 15:50:35 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=8F=B7=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E4=BF=AE=E5=A4=8D=E5=90=8E=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E5=9B=9E=E8=B0=83=E5=BC=82=E5=B8=B8=E4=BF=AE=E5=A4=8D=EF=BC=9A?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87ig=E4=BB=8Epay=5Forder=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E4=B8=AD=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/pay/PayOrderServiceImpl.java      | 21 ++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/pay/PayOrderServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/pay/PayOrderServiceImpl.java
index 275248433..6c742b21c 100644
--- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/pay/PayOrderServiceImpl.java
+++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/pay/PayOrderServiceImpl.java
@@ -564,17 +564,16 @@ public class PayOrderServiceImpl implements PayOrderService {
      * @param notify
      */
     public void notifyOrder(PayOrderRespDTO notify) {
-        // 从payNo中解析组织id
-        Long organId = getOrganIdFromPayNo(notify.getOutTradeNo());
+        String outTradeNo = notify.getOutTradeNo();
 
         // 情况一：支付成功的回调
         if (PayOrderStatusEnum.isSuccess(notify.getStatus())) {
-            notifyOrderSuccess(notify, organId);
+            notifyOrderSuccess(notify, outTradeNo);
             return;
         }
         // 情况二：支付失败的回调
         if (PayOrderStatusEnum.isClosed(notify.getStatus())) {
-            notifyOrderClosed(notify, organId);
+            notifyOrderClosed(notify, outTradeNo);
         }
     }
 
@@ -599,12 +598,11 @@ public class PayOrderServiceImpl implements PayOrderService {
      *
      * @param notify
      */
-    private void notifyOrderSuccess(PayOrderRespDTO notify, Long organId) {
+    private void notifyOrderSuccess(PayOrderRespDTO notify, String outTradeNo) {
         // 1. 判断 PayOrderDO 是否处于待支付
-        String outTradeNo = notify.getOutTradeNo();
         PayOrderDO order = payOrderMapper.selectOne(new LambdaQueryWrapper<PayOrderDO>()
-                .eq(PayOrderDO::getPayNo, outTradeNo)
-                .eq(PayOrderDO::getOrganId, organId));
+                .eq(PayOrderDO::getPayNo, outTradeNo));
+        Long organId = order.getOrganId();
         if (ObjectUtil.isNull(order)) {
             throw exception(PAY_ORDER_NOT_EXIST, outTradeNo);
         }
@@ -734,12 +732,11 @@ public class PayOrderServiceImpl implements PayOrderService {
      *
      * @param notify
      */
-    private void notifyOrderClosed(PayOrderRespDTO notify, Long organId) {
+    private void notifyOrderClosed(PayOrderRespDTO notify, String outTradeNo) {
         // 1. 查询 PayOrderDO
-        String outTradeNo = notify.getOutTradeNo();
         PayOrderDO order = payOrderMapper.selectOne(new LambdaQueryWrapper<PayOrderDO>()
-                .eq(PayOrderDO::getPayNo, outTradeNo)
-                .eq(PayOrderDO::getOrganId, organId));
+                .eq(PayOrderDO::getPayNo, outTradeNo));
+        Long organId = order.getOrganId();
         if (ObjectUtil.isNull(order)) {
             throw exception(PAY_ORDER_NOT_EXIST, outTradeNo);
         }