From 61f5f1a0bb1d17fed2f0db5f22d80a0990497b7e Mon Sep 17 00:00:00 2001
From: gong <1157756119@qq.com>
Date: Tue, 13 Jan 2026 09:21:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=9B=E4=BB=B6=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../order/service/impl/ShopDirectMerchantServiceImpl.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 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 542864737..b8c2e5fb5 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,8 +100,12 @@ public class ShopDirectMerchantServiceImpl extends ServiceImpl<ShopDirectMerchan
         merchant.setBusinessLicenceInfo(JSONObject.toJSONString(reqDto.getBusinessLicenceInfo()));
         merchant.setStoreInfo(JSONObject.toJSONString(reqDto.getStoreInfo()));
         merchant.setSettlementInfo(JSONObject.toJSONString(reqDto.getSettlementInfo()));
-        merchant.setWechatStatus(PayCst.EntryStatus.WAIT);
-        merchant.setAlipayStatus(PayCst.EntryStatus.WAIT);
+        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) {
             result = save(merchant);
         } else {