From f12e7f9802e0cc2d5b407a4bbb65520feece3429 Mon Sep 17 00:00:00 2001
From: gong <1157756119@qq.com>
Date: Wed, 14 Jan 2026 11:32:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=9B=E4=BB=B6=E8=B5=84?=
 =?UTF-8?q?=E6=96=99=E6=97=B6=20=E5=88=A4=E6=96=AD=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E8=BF=9B=E4=BB=B6=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ShopDirectMerchantServiceImpl.java      | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopDirectMerchantServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopDirectMerchantServiceImpl.java
index b8c2e5fb5..1fe1b754d 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopDirectMerchantServiceImpl.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopDirectMerchantServiceImpl.java
@@ -100,15 +100,19 @@ public class ShopDirectMerchantServiceImpl extends ServiceImpl<ShopDirectMerchan
         merchant.setBusinessLicenceInfo(JSONObject.toJSONString(reqDto.getBusinessLicenceInfo()));
         merchant.setStoreInfo(JSONObject.toJSONString(reqDto.getStoreInfo()));
         merchant.setSettlementInfo(JSONObject.toJSONString(reqDto.getSettlementInfo()));
-        if (merchant.getAlipayStatus().equals(PayCst.EntryStatus.INIT) || merchant.getAlipayStatus().equals(PayCst.EntryStatus.REJECTED)) {
-            merchant.setAlipayStatus(PayCst.EntryStatus.WAIT);
-        }
-        if (merchant.getWechatStatus().equals(PayCst.EntryStatus.INIT) || merchant.getWechatStatus().equals(PayCst.EntryStatus.REJECTED)) {
-            merchant.setWechatStatus(PayCst.EntryStatus.WAIT);
-        }
+
         if (isSave) {
+            merchant.setAlipayStatus(PayCst.EntryStatus.WAIT);
+            merchant.setWechatStatus(PayCst.EntryStatus.WAIT);
             result = save(merchant);
         } else {
+            ShopDirectMerchant directMerchant = getById(reqDto.getShopId());
+            if (directMerchant.getAlipayStatus().equals(PayCst.EntryStatus.INIT) || directMerchant.getAlipayStatus().equals(PayCst.EntryStatus.REJECTED)) {
+                merchant.setAlipayStatus(PayCst.EntryStatus.WAIT);
+            }
+            if (directMerchant.getWechatStatus().equals(PayCst.EntryStatus.INIT) || directMerchant.getWechatStatus().equals(PayCst.EntryStatus.REJECTED)) {
+                merchant.setWechatStatus(PayCst.EntryStatus.WAIT);
+            }
             result = updateById(merchant);
         }
         //发送进件队列消息