From a929635bfc5a5c1df43954dd50bfe44b6b748805 Mon Sep 17 00:00:00 2001
From: Jack <46790855@qq.com>
Date: Mon, 29 Dec 2025 20:50:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=97=E9=93=BA=E8=AF=A6=E6=83=85=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AFfix=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/AccountUserBaseServiceImpl.java      |  2 +-
 .../mall/common/constant/RedisConstant.java   |  2 ++
 .../service/impl/ShopMchEntryServiceImpl.java | 25 +++++++++++--------
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/mall-account/src/main/java/com/suisung/mall/account/service/impl/AccountUserBaseServiceImpl.java b/mall-account/src/main/java/com/suisung/mall/account/service/impl/AccountUserBaseServiceImpl.java
index 957fd5a0..f3b21bee 100644
--- a/mall-account/src/main/java/com/suisung/mall/account/service/impl/AccountUserBaseServiceImpl.java
+++ b/mall-account/src/main/java/com/suisung/mall/account/service/impl/AccountUserBaseServiceImpl.java
@@ -97,7 +97,7 @@ import static com.suisung.mall.common.utils.I18nUtil._;
 @Service
 public class AccountUserBaseServiceImpl extends BaseServiceImpl<AccountUserBaseMapper, AccountUserBase> implements AccountUserBaseService {
 
-    private final String VERIFY_CODE_KEY = "register:verifyCode:";
+    private final String VERIFY_CODE_KEY = RedisConstant.VERIFY_CODE_KEY; //"register:verifyCode:";
     private final Logger logger = LoggerFactory.getLogger(AccountUserBaseServiceImpl.class);
     @Autowired
     private AuthService authService;
diff --git a/mall-common/src/main/java/com/suisung/mall/common/constant/RedisConstant.java b/mall-common/src/main/java/com/suisung/mall/common/constant/RedisConstant.java
index 37d51763..3c7082c4 100644
--- a/mall-common/src/main/java/com/suisung/mall/common/constant/RedisConstant.java
+++ b/mall-common/src/main/java/com/suisung/mall/common/constant/RedisConstant.java
@@ -44,4 +44,6 @@ public class RedisConstant {
     // 预约订单任务新增键
     public static final String Order_Booking_Task_Key = ConstantRedis.Cache_NameSpace + "new:order:booking:task:";
 
+    public static final String VERIFY_CODE_KEY = "register:verifyCode:";
+
 }
diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopMchEntryServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopMchEntryServiceImpl.java
index 55e77112..52415a88 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopMchEntryServiceImpl.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopMchEntryServiceImpl.java
@@ -698,12 +698,6 @@ public class ShopMchEntryServiceImpl extends BaseServiceImpl<ShopMchEntryMapper,
                 );
             }
 
-            // 获取店铺信息
-            ShopStoreInfo storeInfo = shopStoreInfoService.getById(record.getStore_id());
-            if (storeInfo == null) {
-                log.warn("店铺信息异常，找不到对应店铺: storeId={}", record.getStore_id());
-                return CommonResult.success(null, "店铺信息异常！");
-            }
 
             // 处理审核意见空值情况
             if (StrUtil.isBlank(record.getApproval_invalid_col())) {
@@ -713,13 +707,22 @@ public class ShopMchEntryServiceImpl extends BaseServiceImpl<ShopMchEntryMapper,
             // 尝试更新入驻表的合同下载地址和合同签署状态
             updateMerchEntrySignedStatusAndContractDownloadUrl(record);
 
-            // 转换为JSONObject并添加额外属性
-            JSONObject retObj = JSONUtil.parseObj(record);
-            retObj.set("is_delivery_self", storeInfo.getIs_delivery_self());
 
-            log.debug("获取商家入驻申请详情成功: recordId={}, mobile={}", recordId, mobile);
-            return CommonResult.success(retObj);
+            if (StrUtil.isNotBlank(record.getStore_id())) {
+                // 转换为JSONObject并添加额外属性
+                JSONObject retObj = JSONUtil.parseObj(record);
+                // 获取店铺信息
+                ShopStoreInfo storeInfo = shopStoreInfoService.getById(record.getStore_id());
+                if (storeInfo != null && retObj != null) {
+//                log.warn("店铺信息异常，找不到对应店铺: storeId={}", record.getStore_id());
+//                return CommonResult.success(null, "店铺信息异常！");
+                    retObj.set("is_delivery_self", storeInfo.getIs_delivery_self());
+                    return CommonResult.success(record);
+                }
+            }
 
+            return CommonResult.success(record);
+            
         } catch (Exception e) {
             log.error("获取商家入驻申请详情异常: recordId={}, mobile={}", recordId, mobile, e);
             return CommonResult.failed("系统异常，请稍后重试");