From f98ffcae1a495f473c8715f7ba5b007a06ea81fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Thu, 16 Oct 2025 14:05:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=BA=97=E5=88=87=E6=8D=A2=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/czg/sa/MyStpLogic.java           | 10 +++++-----
 .../account/service/impl/AuthorizationServiceImpl.java |  1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/cash-common/cash-common-sa-token/src/main/java/com/czg/sa/MyStpLogic.java b/cash-common/cash-common-sa-token/src/main/java/com/czg/sa/MyStpLogic.java
index 6e35d28e..f54cc3ca 100644
--- a/cash-common/cash-common-sa-token/src/main/java/com/czg/sa/MyStpLogic.java
+++ b/cash-common/cash-common-sa-token/src/main/java/com/czg/sa/MyStpLogic.java
@@ -73,21 +73,21 @@ public class MyStpLogic {
     public void switchTo(boolean isMain, Long id, String account, Long shopId, String shopName, LoginType loginType, boolean isAdmin) {
         StpLogic logic = getLogic();
         long headId = logic.getLoginIdAsLong();
-
-        logic.getSaTokenDao().set(splicingKeyTokenValue(logic.getTokenValue()), id.toString(), logic.getTokenTimeout());
+        // 设置主店id
+        Object mainShopId = logic.getSession().get("mainShopId");
         SaSession session = logic.getSession();
+        Object parentId1 = session.get("headShopId");
+        logic.getSaTokenDao().set(splicingKeyTokenValue(logic.getTokenValue()), id.toString(), logic.getTokenTimeout());
+        session = logic.getSession();
         if (session == null) {
             logic.createLoginSession(id);
             session = logic.getSession();
         }
         // 主店没有headShopId
-        Object parentId1 = session.get("headShopId");
         if (!isMain && parentId1 == null) {
             session.set("headId", headId);
         }
 
-        // 设置主店id
-        Object mainShopId = session.get("mainShopId");
         session.set("userId", id).set("isAdmin", isAdmin).set("isManager", loginType.equals(LoginType.MANAGER))
                 .set("loginType", loginType).set("account", account).set("shopId", shopId).set("shopName", shopName)
                 .set("mainShopId", mainShopId);
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 b29c0c9f..31ef748d 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
@@ -177,6 +177,7 @@ public class AuthorizationServiceImpl implements AuthorizationService {
         }
 
         redisService.del(RedisCst.LOGIN_CODE + loginDTO.uuid());
+        System.out.println(StpKit.USER.getMainShopId());
         return new LoginVO(StpKit.USER.getTokenInfo(), promissionList, loginDTO.loginType(), shopInfo, shopStaff);
     }