From ad58d5f2e5e110602d2ba65f4f3e866036ad05c7 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Wed, 3 Dec 2025 11:26:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=97=E9=93=BA=E5=88=B0=E6=9C=9F=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E4=B8=BA=E7=A9=BA=E7=9A=84=20=E6=A0=87=E8=AF=86?=
 =?UTF-8?q?=E5=BA=97=E9=93=BA=E6=9C=AA=E6=BF=80=E6=B4=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/AuthorizationServiceImpl.java       | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AuthorizationServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AuthorizationServiceImpl.java
index 63c045250..df4a37d79 100644
--- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AuthorizationServiceImpl.java
+++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AuthorizationServiceImpl.java
@@ -137,10 +137,14 @@ public class AuthorizationServiceImpl implements AuthorizationService {
         if (shopInfo == null) {
             throw new CzgException("商户不存在");
         }
-        // 过期时间校验
-        if (shopInfo.getExpireTime() != null) {
-            if ((DateUtil.date().toLocalDateTime().isAfter(shopInfo.getExpireTime()))) {
-                throw new CzgException("店铺已到期，请联系区域经理续费");
+        if (shopInfo.getId() != 1) {
+            // 过期时间校验
+            if (shopInfo.getExpireTime() != null) {
+                if ((DateUtil.date().toLocalDateTime().isAfter(shopInfo.getExpireTime()))) {
+                    throw new CzgException("店铺已到期，请联系区域经理续费");
+                }
+            } else {
+                throw new CzgException("店铺未激活");
             }
         }
         boolean isAllowAccountLogin = shopBranchService.isAllowAccountLogin(shopInfo.getId());