Merge remote-tracking branch 'origin/sit' into sit

alien-entity/src/main/java/shop/alien/entity/store/vo/StoreUserVo.java

@@ -62,4 +62,7 @@ public class StoreUserVo extends StoreUser {
     @ApiModelProperty(value = "角色名称（当前账号在目标门店的角色名称）")
     private String roleName;
 
+    @ApiModelProperty(value = "是否有子账号（主账号且有子账号时为true）")
+    private boolean hasSubAccount;
+
 }

alien-entity/src/main/java/shop/alien/mapper/StoreOfficialAlbumMapper.java

@@ -23,7 +23,7 @@ public interface StoreOfficialAlbumMapper extends BaseMapper<StoreOfficialAlbum>
      */
     //"图片类型, 0:其他, 1:入口图, 2:相册, 3:菜品, 4:环境, 5:价目表, 6:推荐菜, 7:菜单, 8:用户评论, 9:商家申诉, 10:商家头像, 11:店铺轮播图"
     @Select("SELECT a.*, b.img_url FROM store_official_album a LEFT JOIN store_img b ON b.id = " +
-            "(SELECT b2.id FROM store_img b2 WHERE b2.business_id = a.id and b2.img_type in ( '2','4') " +
+            "(SELECT b2.id FROM store_img b2 WHERE b2.business_id = a.id and b2.img_type in ( '2','4') and b2.delete_flag = 0 " +
             "order by b2.img_sort LIMIT 1) where a.delete_flag = '0' and  a.store_id = #{storeId}")
     List<StoreOfficialAlbumVo> getStoreOfficialAlbumList(@Param("storeId") Integer storeId);
 

alien-entity/src/main/java/shop/alien/mapper/SubAccountStoreMapper.java

@@ -21,4 +21,11 @@ public interface SubAccountStoreMapper extends BaseMapper<Object> {
      * @return 门店列表
      */
     List<SubAccountStoreListVo> selectSubAccountStoreListByUserId(@Param("userId") Integer userId);
+
+    /**
+     * 根据用户ID查询子账号关联的门店列表 (无主账号情况)
+     * @param userId 用户ID（store_user.id）
+     * @return 门店列表
+     */
+    List<SubAccountStoreListVo> selectSubAccountStoreListByUserIdTwo(@Param("userId") Integer userId);
 }

alien-entity/src/main/resources/mapper/SubAccountStoreMapper.xml

@@ -6,7 +6,7 @@
 
     <!-- 根据用户ID查询子账号关联的门店列表（包含主账号的门店） -->
     <select id="selectSubAccountStoreListByUserId" resultType="shop.alien.entity.store.vo.SubAccountStoreListVo">
-        -- 查询子账号通过store_platform_user_role关联的门店
+        -- 查询子账号通过store_platform_user_role关联的门店（当前用户作为子账号的门店）
         SELECT
             si.id AS storeId,
             si.store_name COLLATE utf8mb4_unicode_ci AS storeName,
@@ -33,6 +33,74 @@
         UNION
         
         -- 查询主账号的门店（通过store_user.store_id关联）
+        -- 如果主账号没有门店，只查主账号信息（门店字段为NULL）
+        SELECT
+            si_main.id AS storeId,
+            si_main.store_name COLLATE utf8mb4_unicode_ci AS storeName,
+            si_main.store_address COLLATE utf8mb4_unicode_ci AS storeAddress,
+            si_main.store_tel COLLATE utf8mb4_unicode_ci AS storeTel,
+            si_main.business_status AS businessStatus,
+            NULL AS roleId,
+            NULL AS roleName,
+            su_main.id AS userId,
+            su_main.name COLLATE utf8mb4_unicode_ci AS accountName,
+            su_main.phone COLLATE utf8mb4_unicode_ci AS phone
+        FROM
+            store_user su_main
+        LEFT JOIN store_info si_main ON su_main.store_id = si_main.id 
+            AND (si_main.delete_flag = 0 OR si_main.delete_flag IS NULL)
+        WHERE
+            su_main.id = #{userId}
+            AND su_main.delete_flag = 0
+            AND (
+                -- 如果主账号在store_platform_user_role表中没有记录，或者是主账号但没有门店
+                NOT EXISTS (
+                    SELECT 1 FROM store_platform_user_role spur 
+                    WHERE spur.user_id = #{userId} 
+                    AND spur.delete_flag = 0
+                )
+                OR
+                -- 如果主账号在store_platform_user_role表中有记录，但没有门店（store_id为NULL或对应的store_info不存在）
+                (su_main.store_id IS NULL OR NOT EXISTS (
+                    SELECT 1 FROM store_info si_check 
+                    WHERE si_check.id = su_main.store_id 
+                    AND si_check.delete_flag = 0
+                ))
+            )
+        
+        
+        ORDER BY storeId DESC
+    </select>
+
+    <!-- 根据用户ID查询子账号关联的门店列表（包含主账号的门店） -->
+    <select id="selectSubAccountStoreListByUserIdTwo" resultType="shop.alien.entity.store.vo.SubAccountStoreListVo">
+        -- 查询子账号通过store_platform_user_role关联的门店
+        SELECT
+            si.id AS storeId,
+            si.store_name COLLATE utf8mb4_unicode_ci AS storeName,
+            si.store_address COLLATE utf8mb4_unicode_ci AS storeAddress,
+            si.store_tel COLLATE utf8mb4_unicode_ci AS storeTel,
+            si.business_status AS businessStatus,
+            spur.role_id AS roleId,
+            spr.role_name COLLATE utf8mb4_unicode_ci AS roleName,
+            spur.user_id AS userId,
+            spur.account_name COLLATE utf8mb4_unicode_ci AS accountName,
+            su.phone COLLATE utf8mb4_unicode_ci AS phone
+        FROM
+            store_platform_user_role spur
+                INNER JOIN store_user su ON spur.user_id = su.id
+                INNER JOIN store_info si ON spur.store_id = si.id
+                LEFT JOIN store_platform_role spr ON spur.role_id = spr.role_id
+                AND (spr.del_flag = '0' OR spr.del_flag IS NULL)
+        WHERE
+            spur.user_id = #{userId}
+          AND spur.delete_flag = 0
+          AND su.delete_flag = 0
+          AND si.delete_flag = 0
+
+        UNION
+
+        -- 查询主账号的门店（通过store_user.store_id关联）
         SELECT
             si_main.id AS storeId,
             si_main.store_name COLLATE utf8mb4_unicode_ci AS storeName,
@@ -46,20 +114,19 @@
             su_main.phone COLLATE utf8mb4_unicode_ci AS phone
         FROM
             store_user su_main
-        INNER JOIN store_info si_main ON su_main.store_id = si_main.id
+                INNER JOIN store_info si_main ON su_main.store_id = si_main.id
         WHERE
             (
                 -- 如果传入的是子账号，查询其主账号的门店
                 (su_main.id = (SELECT sub_account_id FROM store_user WHERE id = #{userId} AND account_type = 2 AND delete_flag = 0 LIMIT 1))
-                OR
-                -- 如果传入的是主账号，查询自己的门店
-                (su_main.id = #{userId} AND su_main.account_type = 1)
+           OR
+           -- 如果传入的是主账号，查询自己的门店
+            (su_main.id = #{userId} AND su_main.account_type = 1)
             )
             AND su_main.delete_flag = 0
             AND si_main.delete_flag = 0
             AND su_main.store_id IS NOT NULL
-        
+
         ORDER BY storeId DESC
     </select>
-
 </mapper>

alien-gateway/src/main/java/shop/alien/gateway/controller/StoreUserController.java

@@ -94,12 +94,16 @@ public class StoreUserController {
     @ApiOperationSupport(order = 2)
     @ApiImplicitParams({
             @ApiImplicitParam(name = "userId", value = "用户ID（store_user.id）", dataType = "Integer", paramType = "query", required = true),
-            @ApiImplicitParam(name = "storeId", value = "目标门店ID", dataType = "Integer", paramType = "query", required = true)
+            @ApiImplicitParam(name = "storeId", value = "目标门店ID", dataType = "Integer", paramType = "query", required = false),
+            @ApiImplicitParam(name = "accountType", value = "主子账号类型", dataType = "Integer", paramType = "query", required = true)
     })
     @GetMapping("/switchSubAccountStore")
-    public R<StoreUserVo> switchSubAccountStore(@RequestParam("userId") Integer userId, @RequestParam("storeId") Integer storeId) {
-        log.info("StoreUserController.switchSubAccountStore?userId={}, storeId={}", userId, storeId);
-        return storeUserService.switchSubAccountStore(userId, storeId);
+    public R<StoreUserVo> switchSubAccountStore(
+            @RequestParam("userId") Integer userId, 
+            @RequestParam(value = "storeId", required = false) Integer storeId,
+            @RequestParam("accountType") Integer accountType) {
+        log.info("StoreUserController.switchSubAccountStore?userId={}, storeId={}, accountType={}", userId, storeId, accountType);
+        return storeUserService.switchSubAccountStore(userId, storeId, accountType);
     }
 
 }

alien-gateway/src/main/java/shop/alien/gateway/service/StoreUserService.java

@@ -25,6 +25,6 @@ public interface StoreUserService extends IService<StoreUser> {
      * @param storeId 目标门店ID
      * @return 用户信息和token
      */
-    R<StoreUserVo> switchSubAccountStore(Integer userId, Integer storeId);
+    R<StoreUserVo> switchSubAccountStore(Integer userId, Integer storeId, Integer accountType);
 
 }

alien-gateway/src/main/java/shop/alien/gateway/service/impl/StoreUserServiceImpl.java

@@ -52,9 +52,9 @@ public class StoreUserServiceImpl extends ServiceImpl<StoreUserGatewayMapper, St
     private final BaseRedisService baseRedisService;
 
     private final StorePlatformUserRoleGatewayMapper storePlatformUserRoleMapper;
-    
+
     private final StorePlatformRoleMenuGatewayMapper storePlatformRoleMenuMapper;
-    
+
     private final StorePlatformRoleGatewayMapper storePlatformRoleMapper;
 
     /**
@@ -96,62 +96,108 @@ public class StoreUserServiceImpl extends ServiceImpl<StoreUserGatewayMapper, St
         tokenMap.put("userType", "store");
         storeUserVo.setToken(JwtUtil.createJWT("store_" + storeUser.getPhone(), storeUser.getName(), JSONObject.toJSONString(tokenMap), effectiveTimeIntLong));
         baseRedisService.setString("store_" + storeUser.getPhone(), storeUserVo.getToken());
-        if(storeUserVo.getStoreId() == null){
-            // 子账号登录，查询当前子账号权限最多的那个门店和角色id
-            log.info("子账号登录，storeId为空，查询权限最多的门店 - userId: {}", storeUser.getId());
-            
-            // 查询子账号关联的所有门店和角色
+
+        if (storeUserVo.getAccountType() == 1) {
+            // 主账号登录，判断是否有子账号
+            // 通过 store_platform_user_role 表中的关联记录判断
+            // 查询该门店下是否有其他账号（子账号）在 store_platform_user_role 表中有关联记录
             LambdaQueryWrapper<StorePlatformUserRole> roleWrapper = new LambdaQueryWrapper<>();
-            roleWrapper.eq(StorePlatformUserRole::getUserId, storeUser.getId())
+            roleWrapper.eq(StorePlatformUserRole::getUserId, storeUser.getId()) // 排除当前账号自己
                     .eq(StorePlatformUserRole::getDeleteFlag, 0);
-            List<StorePlatformUserRole> userRoles = storePlatformUserRoleMapper.selectList(roleWrapper);
-            
-            if (userRoles != null && !userRoles.isEmpty()) {
-                // 计算每个角色的菜单权限数量，选择权限最多的门店
-                StorePlatformUserRole maxPermissionRole = null;
-                int maxPermissionCount = -1;
-                
-                for (StorePlatformUserRole userRole : userRoles) {
-                    if (userRole.getRoleId() != null) {
-                        // 查询该角色的菜单权限数量
-                        Integer permissionCount = storePlatformRoleMenuMapper.countMenuByRoleId(userRole.getRoleId());
-                        if (permissionCount == null) {
-                            permissionCount = 0;
-                        }
-                        
-                        // 如果权限数量更多，或者权限数量相同但角色ID更大，则更新
-                        if (permissionCount > maxPermissionCount || 
-                            (permissionCount == maxPermissionCount && 
-                             (maxPermissionRole == null || userRole.getRoleId() > maxPermissionRole.getRoleId()))) {
-                            maxPermissionCount = permissionCount;
-                            maxPermissionRole = userRole;
-                        }
+            long subAccountCount = storePlatformUserRoleMapper.selectCount(roleWrapper);
+            if (subAccountCount > 0) {
+                storeUserVo.setHasSubAccount(true);
+            } else {
+                storeUserVo.setHasSubAccount(false);
+            }
+            log.info("主账号登录，检查子账号 - userId: {}, storeId: {}, hasSubAccount: {}, subAccountCount: {}",
+                    storeUser.getId(), storeUserVo.getStoreId(), false, subAccountCount);
+        } else {
+            // 子账号切换如果有storeId 则为子账号切换无感登录 否则为正常登录
+            if (storeUser.getStoreId() != null) {
+                LambdaQueryWrapper<StorePlatformUserRole> roleWrapper = new LambdaQueryWrapper<>();
+                roleWrapper.eq(StorePlatformUserRole::getUserId, storeUser.getId())
+                        .eq(StorePlatformUserRole::getStoreId, storeUser.getStoreId())
+                        .eq(StorePlatformUserRole::getDeleteFlag, 0);
+                StorePlatformUserRole userRole = storePlatformUserRoleMapper.selectOne(roleWrapper);
+
+                if (userRole == null) {
+                    log.warn("子账号未关联目标门店 - userId: {}, storeId: {}", storeUser.getId(), storeUser.getStoreId());
+                    return R.fail("切换失败，请确认子账号是否关联了该门店");
+                }
+
+                int finalStoreId = userRole.getStoreId(); // 从关联表获取门店ID
+                StoreInfo storeInfo = storeInfoMapper.selectById(finalStoreId);
+                // 查询角色名称
+                if (userRole.getRoleId() != null) {
+                    StorePlatformRole role = storePlatformRoleMapper.selectById(userRole.getRoleId());
+                    if (role != null) {
+                        storeUserVo.setRoleName(role.getRoleName());
                     }
                 }
-                
-                if (maxPermissionRole != null) {
-                    // 设置门店ID和角色ID
-                    storeUserVo.setStoreId(maxPermissionRole.getStoreId());
-                    storeUserVo.setRoleId(maxPermissionRole.getRoleId());
-                    
-                    // 查询角色名称
-                    if (maxPermissionRole.getRoleId() != null) {
-                        StorePlatformRole role = storePlatformRoleMapper.selectById(maxPermissionRole.getRoleId());
-                        if (role != null) {
-                            storeUserVo.setRoleName(role.getRoleName());
+                storeUserVo.setRoleId(userRole.getRoleId());
+                storeUserVo.setStoreId(storeInfo.getId());
+                storeUserVo.setHasSubAccount(true);
+                storeUserVo.setRoleName(userRole.getAccountName());
+            } else {
+
+                // 子账号登录，查询当前子账号权限最多的那个门店和角色id
+                log.info("子账号登录，storeId为空，查询权限最多的门店 - userId: {}", storeUser.getId());
+                // 查询子账号关联的所有门店和角色
+                LambdaQueryWrapper<StorePlatformUserRole> roleWrapper = new LambdaQueryWrapper<>();
+                roleWrapper.eq(StorePlatformUserRole::getUserId, storeUser.getId())
+                        .eq(StorePlatformUserRole::getDeleteFlag, 0);
+                List<StorePlatformUserRole> userRoles = storePlatformUserRoleMapper.selectList(roleWrapper);
+
+                if (userRoles != null && !userRoles.isEmpty()) {
+                    // 计算每个角色的菜单权限数量，选择权限最多的门店
+                    StorePlatformUserRole maxPermissionRole = null;
+                    int maxPermissionCount = -1;
+
+                    for (StorePlatformUserRole userRole : userRoles) {
+                        if (userRole.getRoleId() != null) {
+                            // 查询该角色的菜单权限数量
+                            Integer permissionCount = storePlatformRoleMenuMapper.countMenuByRoleId(userRole.getRoleId());
+                            if (permissionCount == null) {
+                                permissionCount = 0;
+                            }
+
+                            // 如果权限数量更多，或者权限数量相同但角色ID更大，则更新
+                            if (permissionCount > maxPermissionCount ||
+                                    (permissionCount == maxPermissionCount &&
+                                            (maxPermissionRole == null || userRole.getRoleId() > maxPermissionRole.getRoleId()))) {
+                                maxPermissionCount = permissionCount;
+                                maxPermissionRole = userRole;
+                            }
+                        }
+                    }
+
+                    if (maxPermissionRole != null) {
+                        // 设置门店ID和角色ID
+                        storeUserVo.setStoreId(maxPermissionRole.getStoreId());
+                        storeUserVo.setRoleId(maxPermissionRole.getRoleId());
+                        storeUserVo.setHasSubAccount(true);
+
+                        // 查询角色名称
+                        if (maxPermissionRole.getRoleId() != null) {
+                            StorePlatformRole role = storePlatformRoleMapper.selectById(maxPermissionRole.getRoleId());
+                            if (role != null) {
+                                storeUserVo.setRoleName(role.getRoleName());
+                            }
                         }
+
+                        log.info("子账号权限最多的门店查询成功 - userId: {}, storeId: {}, roleId: {}, roleName: {}, 权限数量: {}",
+                                storeUser.getId(), maxPermissionRole.getStoreId(), maxPermissionRole.getRoleId(),
+                                storeUserVo.getRoleName(), maxPermissionCount);
+                    } else {
+                        log.warn("子账号关联的门店都没有角色ID - userId: {}", storeUser.getId());
                     }
-                    
-                    log.info("子账号权限最多的门店查询成功 - userId: {}, storeId: {}, roleId: {}, roleName: {}, 权限数量: {}", 
-                            storeUser.getId(), maxPermissionRole.getStoreId(), maxPermissionRole.getRoleId(), 
-                            storeUserVo.getRoleName(), maxPermissionCount);
                 } else {
-                    log.warn("子账号关联的门店都没有角色ID - userId: {}", storeUser.getId());
+                    log.warn("子账号未关联任何门店 - userId: {}", storeUser.getId());
                 }
-            } else {
-                log.warn("子账号未关联任何门店 - userId: {}", storeUser.getId());
             }
         }
+
         // 查询门店信息（如果storeId不为空）
         StoreInfo storeInfo = null;
         if (storeUserVo.getStoreId() != null) {
@@ -165,13 +211,13 @@ public class StoreUserServiceImpl extends ServiceImpl<StoreUserGatewayMapper, St
     }
 
     @Override
-    public R<StoreUserVo> switchSubAccountStore(Integer userId, Integer storeId) {
+    public R<StoreUserVo> switchSubAccountStore(Integer userId, Integer storeId, Integer accountType) {
         log.info("StoreUserServiceImpl.switchSubAccountStore?userId={}, storeId={}", userId, storeId);
 
-        if (userId == null || storeId == null) {
-            log.warn("用户ID或门店ID为空 - userId: {}, storeId: {}", userId, storeId);
-            return R.fail("用户ID或门店ID不能为空");
-        }
+//        if (userId == null || storeId == null) {
+//            log.warn("用户ID或门店ID为空 - userId: {}, storeId: {}", userId, storeId);
+//            return R.fail("用户ID或门店ID不能为空");
+//        }
 
         // 1. 查询用户信息（类似登录接口，验证用户是否存在）
         StoreUser storeUser = this.getById(userId);
@@ -186,72 +232,25 @@ public class StoreUserServiceImpl extends ServiceImpl<StoreUserGatewayMapper, St
             return R.fail("账号被禁用");
         }
 
-        // 3. 判断是主账号还是子账号，并验证门店关联
-        Long roleId = null;
-        Integer finalStoreId = null; // 最终要回显的门店ID
-        StoreInfo storeInfo = new StoreInfo();
-        if (storeUser.getStoreId() != null && storeUser.getStoreId().equals(storeId)) {
-            // 主账号：直接回显 store_user 的门店 id
-//            if (storeUser.getStoreId() == null || !storeUser.getStoreId().equals(storeId)) {
-//                log.warn("主账号门店ID不匹配 - userId: {}, 传入storeId: {}, 实际storeId: {}",
-//                        userId, storeId, storeUser.getStoreId());
-//                return R.fail("切换失败，门店ID不匹配");
-//            }
-            finalStoreId = storeUser.getStoreId();
-            roleId = null; // 主账号没有角色id
-        } else {
-            // 子账号：查询角色关联表，回显子账号关联的门店 id
-            LambdaQueryWrapper<StorePlatformUserRole> roleWrapper = new LambdaQueryWrapper<>();
-            roleWrapper.eq(StorePlatformUserRole::getUserId, userId)
-                    .eq(StorePlatformUserRole::getStoreId, storeId)
-                    .eq(StorePlatformUserRole::getDeleteFlag, 0);
-            StorePlatformUserRole userRole = storePlatformUserRoleMapper.selectOne(roleWrapper);
-            
-            if (userRole == null) {
-                log.warn("子账号未关联目标门店 - userId: {}, storeId: {}", userId, storeId);
-                return R.fail("切换失败，请确认子账号是否关联了该门店");
-            }
-            
-            finalStoreId = userRole.getStoreId(); // 从关联表获取门店ID
-            storeInfo = storeInfoMapper.selectById(finalStoreId);
-            roleId = userRole.getRoleId() != null ? userRole.getRoleId() : null;
-        }
-
-        // 4. 删除旧的token（参考switchingStates逻辑）
+        // 3. 删除旧的token（参考switchingStates逻辑）
         baseRedisService.delete("store_" + storeUser.getPhone());
         baseRedisService.delete("storePlatform_" + storeUser.getPhone());
         log.info("删除用户token - phone: {}", storeUser.getPhone());
 
-        // 5. 创建临时用户对象用于生成token（设置正确的门店ID）
+        // 4. 创建临时用户对象用于生成token（设置正确的门店ID）
         StoreUser tempUser = new StoreUser();
         BeanUtils.copyProperties(storeUser, tempUser);
-        tempUser.setStoreId(finalStoreId);
+        tempUser.setAccountType(accountType);
+        tempUser.setStoreId(storeId);
 
-        // 6. 生成token（类似登录接口）
+        // 6. 生成token（类似登录接口）走切换账号逻辑
         R<StoreUserVo> tokenResult = createToKen(tempUser);
         if (tokenResult.getCode() != 200 || tokenResult.getData() == null) {
             log.error("生成token失败 - userId: {}", userId);
             return R.fail("切换失败，token生成失败");
         }
 
-        // 7. 设置角色ID和门店ID（如果没有角色id，该字段为null）
         StoreUserVo storeUserVo = tokenResult.getData();
-        storeUserVo.setRoleId(roleId);
-        storeUserVo.setStoreId(finalStoreId); // 确保回显正确的门店ID
-        
-        // 查询并设置角色名称
-        if (roleId != null) {
-            StorePlatformRole role = storePlatformRoleMapper.selectById(roleId);
-            if (role != null) {
-                storeUserVo.setRoleName(role.getRoleName());
-            }
-        }
-        
-        if(storeInfo != null){
-            storeUserVo.setName(storeInfo.getStoreName());
-        }
-
-        log.info("切换门店成功 - userId: {}, storeId: {}, roleId: {}", userId, finalStoreId, roleId);
         return R.data(storeUserVo);
     }
 

alien-store/src/main/java/shop/alien/store/service/impl/SubAccountStoreServiceImpl.java

@@ -1,9 +1,15 @@
 package shop.alien.store.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
+import shop.alien.entity.store.StorePlatformRole;
+import shop.alien.entity.store.StorePlatformUserRole;
+import shop.alien.entity.store.StoreUser;
 import shop.alien.entity.store.vo.SubAccountStoreListVo;
+import shop.alien.mapper.StorePlatformUserRoleMapper;
+import shop.alien.mapper.StoreUserMapper;
 import shop.alien.mapper.SubAccountStoreMapper;
 import shop.alien.store.service.SubAccountStoreService;
 
@@ -23,14 +29,34 @@ public class SubAccountStoreServiceImpl implements SubAccountStoreService {
 
     private final SubAccountStoreMapper subAccountStoreMapper;
 
+    private final StorePlatformUserRoleMapper storePlatformUserRoleMapper;
+
+    private final StoreUserMapper storeUserMapper;
+
     @Override
     public List<SubAccountStoreListVo> getSubAccountStoreList(Integer userId) {
         log.info("SubAccountStoreServiceImpl.getSubAccountStoreList?userId={}", userId);
+        List<SubAccountStoreListVo> storeList = new ArrayList<>();
         if (userId == null) {
             log.warn("用户ID为空");
             return new ArrayList<>();
         }
-        List<SubAccountStoreListVo> storeList = subAccountStoreMapper.selectSubAccountStoreListByUserId(userId);
+        List<StorePlatformUserRole> list = new ArrayList<>();
+        StoreUser storeUser = storeUserMapper.selectOne(new LambdaQueryWrapper<StoreUser>()
+                .eq(StoreUser :: getId, userId));
+        if(storeUser!=null){
+            if(storeUser.getAccountType() != 1){
+                list = storePlatformUserRoleMapper.selectList(new LambdaQueryWrapper<StorePlatformUserRole>()
+                        .eq(StorePlatformUserRole :: getUserId, userId));
+            }
+        }
+        if(list.size()>0 || storeUser.getStoreId() != null){
+            //查出主子账号所有门店信息回显
+            storeList = subAccountStoreMapper.selectSubAccountStoreListByUserIdTwo(userId);
+        }else{
+            //主账号没有门店 子账号有门店 查出主账号 账号信息和子账号门店信息组合回显
+            storeList = subAccountStoreMapper.selectSubAccountStoreListByUserId(userId);
+        }
         log.info("查询子账号关联门店列表完成 - 用户ID: {}, 门店数量: {}", userId, storeList != null ? storeList.size() : 0);
         return storeList;
     }