子账号登录

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

@@ -146,6 +146,7 @@ public class StoreUserServiceImpl extends ServiceImpl<StoreUserGatewayMapper, St
                 // 查询子账号关联的所有门店和角色
                 LambdaQueryWrapper<StorePlatformUserRole> roleWrapper = new LambdaQueryWrapper<>();
                 roleWrapper.eq(StorePlatformUserRole::getUserId, storeUser.getId())
+                        .eq(StorePlatformUserRole::getStatus, 0)
                         .eq(StorePlatformUserRole::getDeleteFlag, 0);
                 List<StorePlatformUserRole> userRoles = storePlatformUserRoleMapper.selectList(roleWrapper);
 
@@ -196,7 +197,8 @@ public class StoreUserServiceImpl extends ServiceImpl<StoreUserGatewayMapper, St
                         log.warn("子账号关联的门店都没有角色ID - userId: {}", storeUser.getId());
                     }
                 } else {
-                    log.warn("子账号未关联任何门店 - userId: {}", storeUser.getId());
+                    log.warn("子账号未关联任何门店或子账号已被禁用 - userId: {}", storeUser.getId());
+                    return R.fail("子账号已被禁用无法登录");
                 }
             }
         }