中台bug修复

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

@@ -15,8 +15,8 @@ public class StoreSubExcelVo {
     @ApiModelProperty(value = "序号")
     private Integer serialNumber;
 
-    @ApiModelProperty(value = "主账号ID")
-    @ExcelHeader(value = "主账号ID")
+    @ApiModelProperty(value = "账号ID")
+    @ExcelHeader(value = "账号ID")
     private Integer id;
 
     @ApiModelProperty(value = "主账号手机号")

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

@@ -217,7 +217,7 @@ public class StoreUserController {
     }
 
     /**
-     * web端查询用户列表（支持主账号和子账号查询） 分页查询重构
+     * web端查询用户列表（支持主账号和子账号查询）
      */
     @ApiOperation("web端查询用户列表（支持主账号和子账号查询）")
     @ApiOperationSupport(order = 7)
@@ -292,25 +292,18 @@ public class StoreUserController {
         return storeUserService.deleteStoreUser(id);
     }
 
-
-
     /**
-     * web端切换商家端用户状态  （主账号有子账号时禁止禁用；子账号无限制；返回更新后状态供前端及时展示）
+     * web端切换商家端用户
      */
-    @ApiOperation("web端切换商家端用户状态（主账号有子账号时禁止禁用；返回更新后状态供前端及时展示）")
+    @ApiOperation("web端切换商家端用户")
     @ApiOperationSupport(order = 7)
     @PutMapping("/switchingStates")
     public R<StoreUserVo> switchingStates(@RequestBody StoreUser storeUser) {
         log.info("StoreUserController.switchingStates?storeUser={}", storeUser);
-        try {
-            return storeUserService.switchingStates(storeUser);
-        } catch (Exception e) {
-            log.warn("StoreUserController.switchingStates 校验或切换失败: {}", e.getMessage());
-            return R.fail(e.getMessage());
-        }
+        storeUserService.switchingStates(storeUser);
+        return R.success("切换成功");
     }
 
-
     @ApiOperation(value = "web端导出商家端账号相关信息")
     @ApiOperationSupport(order = 6)
     @GetMapping("/exportExcel")
@@ -323,8 +316,6 @@ public class StoreUserController {
     }
 
 
-
-
     /**
      * register
      *

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

@@ -100,7 +100,7 @@ public interface StoreUserService extends IService<StoreUser> {
      *
      * @return boolean
      */
-    R<IPage<StoreUserVo>> getStoreUserList(int pageNum, int pageSize, String id, String phone, Integer status,Integer accountType, String mainAccountId, String mainAccountPhone);
+    R<IPage<StoreUserVo>> getStoreUserList(int pageNum, int pageSize, String id, String phone, Integer status, Integer accountType, String mainAccountId, String mainAccountPhone);
 
 
     /**
@@ -129,7 +129,7 @@ public interface StoreUserService extends IService<StoreUser> {
      *
      * @return boolean
      */
-    R<StoreUserVo> switchingStates(StoreUser storeUser);
+    void switchingStates(StoreUser storeUser);
 
 
     /**

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

@@ -271,7 +271,7 @@ public class StoreUserServiceImpl extends ServiceImpl<StoreUserMapper, StoreUser
     }
 
     private void passwordVerification(String phone, String password, String newPassword, String confirmNewPassword) {
-        LambdaQueryWrapper<StoreUser> wrapperFans = new LambdaQueryWrapper<>();
+        LambdaUpdateWrapper<StoreUser> wrapperFans = new LambdaUpdateWrapper<>();
         wrapperFans.eq(StoreUser::getPhone, phone);
         StoreUser storeUser = this.getOne(wrapperFans);
         if (!newPassword.equals(confirmNewPassword)) {
@@ -282,10 +282,9 @@ public class StoreUserServiceImpl extends ServiceImpl<StoreUserMapper, StoreUser
             log.info("该手机号没有注册过账户");
             throw new RuntimeException("该手机号没有注册过账户");
         } else {
-            // 由于password字段使用了EncryptTypeHandler，查询时密码会被自动解密
-            // 所以这里直接比较解密后的密码和用户输入的明文密码
-            String dbPassword = storeUser.getPassword();
-            if (dbPassword == null || dbPassword.isEmpty() || !dbPassword.equals(password)) {
+            wrapperFans.eq(StoreUser::getPassword, password);
+            StoreUser storeUserPw = this.getOne(wrapperFans);
+            if (storeUserPw == null || storeUserPw.getPassword().equals("")) {
                 log.info("原密码错误");
                 throw new RuntimeException("原密码错误");
             }
@@ -405,164 +404,151 @@ public class StoreUserServiceImpl extends ServiceImpl<StoreUserMapper, StoreUser
     }
 
     @Override
-    public R<IPage<StoreUserVo>> getStoreUserList(int pageNum, int pageSize, String id, String phone, Integer status, Integer accountType, String mainAccountId, String mainAccountPhone) {
+    public R<IPage<StoreUserVo>> getStoreUserList(int pageNum, int pageSize, String id, String phone, Integer status,Integer accountType) {
+
         IPage<StoreUser> page = new Page<>(pageNum, pageSize);
         IPage<StoreUserVo> storeUserVoIPage = new Page<>();
-        // 子账号分支：以 store_platform_user_role 每条记录为一行（不去重 userId），同一子账号在不同店铺展示多行，每行带主账号 id
+        // 查询子账号（accountType == 2）
         if (accountType == 2) {
+            // 构建子账号查询条件
+            LambdaQueryWrapper<StoreUser> subAccountWrapper = new LambdaQueryWrapper<>();
+            subAccountWrapper.eq(StoreUser::getAccountType, 2) // 子账号类型
+                    .eq(status != null, StoreUser::getStatus, status);
+
+            // 先通过中间表storePlatformUserRole获取所有子账号的userId列表
             LambdaQueryWrapper<StorePlatformUserRole> roleWrapper = new LambdaQueryWrapper<>();
-            roleWrapper.eq(StorePlatformUserRole::getDeleteFlag, 0);
             List<StorePlatformUserRole> userRoles = storePlatformUserRoleMapper.selectList(roleWrapper);
-            if (CollectionUtils.isEmpty(userRoles)) {
-                storeUserVoIPage.setRecords(new ArrayList<>());
-                storeUserVoIPage.setTotal(0);
-                storeUserVoIPage.setCurrent(pageNum);
-                storeUserVoIPage.setSize(pageSize);
-                return R.data(storeUserVoIPage);
+            List<Integer> subAccountUserIds = null;
+            if (!CollectionUtils.isEmpty(userRoles)) {
+                // 提取所有在中间表中的子账号userId
+                subAccountUserIds = userRoles.stream()
+                        .map(StorePlatformUserRole::getUserId)
+                        .distinct()
+                        .collect(Collectors.toList());
             }
 
-            // 主账号ID 模糊：只保留 platform 中 store_id 属于这些主账号店铺的 role 记录
-            if (StringUtils.isNotEmpty(mainAccountId)) {
-                LambdaQueryWrapper<StoreUser> mainById = new LambdaQueryWrapper<>();
-                mainById.eq(StoreUser::getAccountType, 1).eq(StoreUser::getDeleteFlag, 0)
-                        .apply("CAST(id AS CHAR) LIKE {0}", "%" + mainAccountId + "%");
-                List<StoreUser> mains = storeUserMapper.selectList(mainById);
-                List<Integer> storeIds = mains == null ? Collections.emptyList() : mains.stream().map(StoreUser::getStoreId).filter(Objects::nonNull).distinct().collect(Collectors.toList());
-                if (storeIds.isEmpty()) {
-                    userRoles = Collections.emptyList();
-                } else {
-                    userRoles = userRoles.stream().filter(r -> storeIds.contains(r.getStoreId())).collect(Collectors.toList());
-                }
+            // 当id不为空时，对ID进行模糊查询（将ID转换为字符串进行模糊匹配）
+            if (StringUtils.isNotEmpty(id)) {
+                // 使用apply方法，将ID转换为字符串进行模糊查询
+                subAccountWrapper.apply("CAST(id AS CHAR) LIKE {0}", "%" + id + "%");
             }
-            // 主账号联系电话 模糊：只保留 platform 中 store_id 属于这些主账号店铺的 role 记录
-            if (StringUtils.isNotEmpty(mainAccountPhone) && !userRoles.isEmpty()) {
-                LambdaQueryWrapper<StoreUser> mainByPhone = new LambdaQueryWrapper<>();
-                mainByPhone.eq(StoreUser::getAccountType, 1).eq(StoreUser::getDeleteFlag, 0).like(StoreUser::getPhone, mainAccountPhone);
-                List<StoreUser> mains = storeUserMapper.selectList(mainByPhone);
-                List<Integer> storeIds = mains == null ? Collections.emptyList() : mains.stream().map(StoreUser::getStoreId).filter(Objects::nonNull).distinct().collect(Collectors.toList());
-                if (storeIds.isEmpty()) {
-                    userRoles = Collections.emptyList();
+
+            // 当phone不为空时，对子账号和主账号电话进行模糊查询，并关联storePlatformUserRole
+            if (StringUtils.isNotEmpty(phone)) {
+                if (subAccountUserIds != null && !subAccountUserIds.isEmpty()) {
+                    // 先查询主账号phone匹配的主账号ID列表
+                    LambdaQueryWrapper<StoreUser> mainAccountWrapper = new LambdaQueryWrapper<>();
+                    mainAccountWrapper.eq(StoreUser::getAccountType, 1)
+                            .like(StoreUser::getPhone, phone);
+                    List<StoreUser> mainAccounts = storeUserMapper.selectList(mainAccountWrapper);
+                    List<Integer> mainAccountIds = mainAccounts.stream()
+                            .map(StoreUser::getId)
+                            .collect(Collectors.toList());
+
+                    // 限制查询范围：只查询在中间表中存在的子账号
+                    subAccountWrapper.in(StoreUser::getId, subAccountUserIds);
+                    // 查询条件：在中间表范围内的子账号中，子账号phone匹配 OR 主账号phone匹配
+                    subAccountWrapper.and(wrapper -> {
+                        // 子账号本身的phone模糊查询
+                        wrapper.like(StoreUser::getPhone, phone);
+                        // 或者主账号phone匹配（通过subAccountId关联到主账号）
+                        if (!CollectionUtils.isEmpty(mainAccountIds)) {
+                            wrapper.or().in(StoreUser::getSubAccountId, mainAccountIds);
+                        }
+                    });
                 } else {
-                    userRoles = userRoles.stream().filter(r -> storeIds.contains(r.getStoreId())).collect(Collectors.toList());
+                    // 如果没有中间表数据，先查询主账号phone匹配的主账号ID
+                    LambdaQueryWrapper<StoreUser> mainAccountWrapper = new LambdaQueryWrapper<>();
+                    mainAccountWrapper.eq(StoreUser::getAccountType, 1)
+                            .like(StoreUser::getPhone, phone);
+                    List<StoreUser> mainAccounts = storeUserMapper.selectList(mainAccountWrapper);
+                    List<Integer> mainAccountIds = mainAccounts.stream()
+                            .map(StoreUser::getId)
+                            .collect(Collectors.toList());
+
+                    // 查询条件：子账号phone匹配 OR 主账号phone匹配
+                    if (!CollectionUtils.isEmpty(mainAccountIds)) {
+                        subAccountWrapper.and(wrapper -> {
+                            wrapper.like(StoreUser::getPhone, phone)
+                                    .or().in(StoreUser::getSubAccountId, mainAccountIds);
+                        });
+                    } else {
+                        // 如果没有主账号匹配，只查询子账号phone
+                        subAccountWrapper.like(StoreUser::getPhone, phone);
+                    }
+                }
+            } else {
+                // phone为空时，如果中间表有数据，限制只查询中间表中的子账号
+                if (subAccountUserIds != null && !subAccountUserIds.isEmpty()) {
+                    subAccountWrapper.in(StoreUser::getId, subAccountUserIds);
                 }
             }
 
-            if (userRoles.isEmpty()) {
-                storeUserVoIPage.setRecords(new ArrayList<>());
-                storeUserVoIPage.setTotal(0);
-                storeUserVoIPage.setCurrent(pageNum);
-                storeUserVoIPage.setSize(pageSize);
-                return R.data(storeUserVoIPage);
-            }
-
-            // 按子账号 id/phone/status 过滤：批量查 store_user，只保留对应子账号满足条件的 role
-            List<Integer> distinctUserIds = userRoles.stream().map(StorePlatformUserRole::getUserId).filter(Objects::nonNull).distinct().collect(Collectors.toList());
-            List<StoreUser> subAccountList = distinctUserIds.isEmpty() ? Collections.emptyList() : storeUserMapper.selectBatchIds(distinctUserIds);
-            Map<Integer, StoreUser> subAccountMap = subAccountList == null ? new HashMap<>() : subAccountList.stream().filter(u -> u.getDeleteFlag() != null && u.getDeleteFlag() == 0).collect(Collectors.toMap(StoreUser::getId, u -> u, (a, b) -> a));
-            List<StorePlatformUserRole> filteredRoles = new ArrayList<>();
-            for (StorePlatformUserRole role : userRoles) {
-                StoreUser subAccount = subAccountMap.get(role.getUserId());
-                if (subAccount == null) continue;
-                if (StringUtils.isNotEmpty(id) && (subAccount.getId() == null || !String.valueOf(subAccount.getId()).contains(id))) continue;
-                if (StringUtils.isNotEmpty(phone) && (subAccount.getPhone() == null || !subAccount.getPhone().contains(phone))) continue;
-                if (status != null && !status.equals(subAccount.getStatus())) continue;
-                filteredRoles.add(role);
-            }
-            filteredRoles.sort(Comparator.comparing(StorePlatformUserRole::getId, Comparator.nullsLast(Comparator.naturalOrder())));
-
-            int total = filteredRoles.size();
-            storeUserVoIPage.setTotal(total);
-            storeUserVoIPage.setCurrent(pageNum);
-            storeUserVoIPage.setSize(pageSize);
-            int from = (pageNum - 1) * pageSize;
-            if (from >= total) {
-                storeUserVoIPage.setRecords(new ArrayList<>());
-                return R.data(storeUserVoIPage);
-            }
-            int to = Math.min(from + pageSize, total);
-            List<StorePlatformUserRole> pageRoles = filteredRoles.subList(from, to);
-
-            // 批量查本页主账号，避免 N+1
-            List<Integer> pageStoreIds = pageRoles.stream().map(StorePlatformUserRole::getStoreId).filter(Objects::nonNull).distinct().collect(Collectors.toList());
-            Map<Integer, StoreUser> mainAccountMap = new HashMap<>();
-            if (!pageStoreIds.isEmpty()) {
-                LambdaQueryWrapper<StoreUser> mainW = new LambdaQueryWrapper<>();
-                mainW.eq(StoreUser::getAccountType, 1).eq(StoreUser::getDeleteFlag, 0).in(StoreUser::getStoreId, pageStoreIds);
-                List<StoreUser> mains = storeUserMapper.selectList(mainW);
-                if (mains != null) mains.forEach(m -> mainAccountMap.put(m.getStoreId(), m));
-            }
+            subAccountWrapper.orderByDesc(StoreUser::getCreatedTime);
 
+            IPage<StoreUser> subAccountsPage = storeUserMapper.selectPage(page, subAccountWrapper);
+            BeanUtils.copyProperties(subAccountsPage, storeUserVoIPage);
+            
             List<StoreUserVo> resultRecords = new ArrayList<>();
-            for (StorePlatformUserRole role : pageRoles) {
-                StoreUser subAccount = subAccountMap.get(role.getUserId());
-                if (subAccount == null) continue;
+            for (StoreUser subAccount : subAccountsPage.getRecords()) {
                 StoreUserVo storeUserVo = new StoreUserVo();
                 BeanUtils.copyProperties(subAccount, storeUserVo);
-                storeUserVo.setSwitchStatus(subAccount.getStatus() != null && subAccount.getStatus() == 0);
-                storeUserVo.setPhone(subAccount.getPhone());
-                StoreUser mainAccount = role.getStoreId() == null ? null : mainAccountMap.get(role.getStoreId());
-                if (mainAccount != null) {
-                    storeUserVo.setParentAccountId(mainAccount.getId());
-                    storeUserVo.setParentAccountPhone(mainAccount.getPhone());
-                    storeUserVo.setParentAccountName(mainAccount.getName());
+                
+                // 查询主账号信息（通过 subAccountId 关联）
+                if (subAccount.getSubAccountId() != null) {
+                    StoreUser mainAccount = storeUserMapper.selectById(subAccount.getSubAccountId());
+                    if (mainAccount != null) {
+                        // 设置主账号联系电话
+                        storeUserVo.setParentAccountPhone(mainAccount.getPhone());
+                        storeUserVo.setParentAccountId(mainAccount.getId());
+                        storeUserVo.setParentAccountName(mainAccount.getName());
+                    }
                 }
+                
+                // 不返回密码
                 storeUserVo.setPassword(null);
                 storeUserVo.setPayPassword(null);
+                
                 resultRecords.add(storeUserVo);
             }
+            
             storeUserVoIPage.setRecords(resultRecords);
             return R.data(storeUserVoIPage);
         }
 
-        // 主账号分支：直接查库返回最新 status，主账号页面展示子账号数量（按 store_platform_user_role 统计）
+        // 查询主账号（accountType == 1）
         LambdaQueryWrapper<StoreUser> storeUserLambdaQueryWrapper = new LambdaQueryWrapper<>();
-        storeUserLambdaQueryWrapper.eq(StoreUser::getDeleteFlag, 0)
-                .like(StringUtils.isNotEmpty(id), StoreUser::getId, id)
-                .like(StringUtils.isNotEmpty(phone), StoreUser::getPhone, phone)
+        storeUserLambdaQueryWrapper.like(!StringUtils.isEmpty(id), StoreUser::getId, id)
+                .like(!StringUtils.isEmpty(phone), StoreUser::getPhone, phone)
                 .eq(status != null, StoreUser::getStatus, status)
-                .eq(StoreUser::getAccountType, 1)
+                .eq(StoreUser::getAccountType, accountType)
                 .orderByDesc(StoreUser::getCreatedTime);
-
+        
         IPage<StoreUser> storeUsers = storeUserMapper.selectPage(page, storeUserLambdaQueryWrapper);
         BeanUtils.copyProperties(storeUsers, storeUserVoIPage);
-
-        List<StoreUserVo> resultRecords = new ArrayList<>();
-        for (StoreUser storeUser : storeUsers.getRecords()) {
-            StoreUserVo vo = new StoreUserVo();
-            BeanUtils.copyProperties(storeUser, vo);
-            vo.setPassword(null);
-            vo.setPayPassword(null);
-            vo.setSwitchStatus(storeUser.getStatus() != null && storeUser.getStatus() == 0);
-            int childCount = countSubAccountUserIdsByStoreId(storeUser.getStoreId(), storeUser.getId());
-            vo.setChildAccountCount(childCount);
-            List<Integer> childUserIds = getSubAccountUserIdsByStoreId(storeUser.getStoreId(), storeUser.getId());
-            if (!childUserIds.isEmpty()) {
-                List<StoreUser> childUsers = storeUserMapper.selectBatchIds(childUserIds);
-                vo.setChildPhoneNumbers(childUsers == null ? Collections.emptyList() : childUsers.stream().map(StoreUser::getPhone).collect(Collectors.toList()));
+        
+        for (StoreUser storeUser : storeUserVoIPage.getRecords()) {
+            // 不返回密码
+            storeUser.setPassword(null);
+            storeUser.setPayPassword(null);
+
+            // 如果是主账号，统计子账号数量
+            if (accountType == 1) {
+                List<StoreUser> childAccounts = getChildAccountsByParentId(String.valueOf(storeUser.getId()));
+                Integer childCount = childAccounts != null ? childAccounts.size() : 0;
+                storeUser.setChildAccountCount(childCount);
+                if (childAccounts != null && !childAccounts.isEmpty()) {
+                    List<String> childPhoneNumbers = childAccounts.stream()
+                            .map(StoreUser::getPhone)
+                            .collect(Collectors.toList());
+                    storeUser.setChildPhoneNumbers(childPhoneNumbers);
+                }
             }
-            resultRecords.add(vo);
         }
-        storeUserVoIPage.setRecords(resultRecords);
-        return R.data(storeUserVoIPage);
-    }
-
-    /** 按 store_platform_user_role 统计该店铺下子账号数量（排除主账号自身，按 distinct user_id 计） */
-    private int countSubAccountUserIdsByStoreId(Integer storeId, Integer excludeUserId) {
-        List<Integer> userIds = getSubAccountUserIdsByStoreId(storeId, excludeUserId);
-        return userIds == null ? 0 : userIds.size();
-    }
 
-    /** 按 store_platform_user_role 查询该店铺下子账号 userId 列表（排除主账号自身） */
-    private List<Integer> getSubAccountUserIdsByStoreId(Integer storeId, Integer excludeUserId) {
-        if (storeId == null) return Collections.emptyList();
-        LambdaQueryWrapper<StorePlatformUserRole> w = new LambdaQueryWrapper<>();
-        w.eq(StorePlatformUserRole::getStoreId, storeId).eq(StorePlatformUserRole::getDeleteFlag, 0);
-        if (excludeUserId != null) w.ne(StorePlatformUserRole::getUserId, excludeUserId);
-        List<StorePlatformUserRole> list = storePlatformUserRoleMapper.selectList(w);
-        return list == null ? Collections.emptyList() : list.stream().map(StorePlatformUserRole::getUserId).distinct().collect(Collectors.toList());
+        return R.data(storeUserVoIPage);
     }
 
-
     @Override
     public R<StoreUserVo> editStoreUser(StoreUser storeUser) {
         storeUserMapper.updateById(storeUser);
@@ -615,125 +601,89 @@ public class StoreUserServiceImpl extends ServiceImpl<StoreUserMapper, StoreUser
         return R.success("删除成功");
     }
 
-
-    /**
-     * web端切换商家端用户状态（主账号底下有子账号时禁止禁用；子账号无限制）
-     * @param storeUserParam
-     * @return
-     */
     @Override
-    public R<StoreUserVo> switchingStates(StoreUser storeUserParam) {
+    public void switchingStates(StoreUser storeUserParam) {
         StoreUser storeUser = storeUserMapper.selectById(storeUserParam.getId());
-        if (storeUser == null) {
-            throw new RuntimeException("用户不存在");
-        }
-        // 仅当「即将禁用」时校验：主账号且该店铺下在 store_platform_user_role 中有关联子账号则禁止禁用
-        if (storeUser.getStatus() != null && storeUser.getStatus() == 0) {
-            if (storeUser.getAccountType() != null && storeUser.getAccountType() == 1) {
-                int subCount = countSubAccountUserIdsByStoreId(storeUser.getStoreId(), storeUser.getId());
-                if (subCount > 0) {
-                    throw new RuntimeException("请先删除主账号下的子账号后再禁用");
-                }
-            }
-            // 禁用时删除 token
+        //如果当前为启用，则删除token
+        if (storeUser.getStatus() == 0) {
+            //删除用户redis中的token
             baseRedisService.delete("store_" + storeUser.getPhone());
         }
-        // 根据当前状态切另一个状态
-        int newStatus = storeUser.getStatus() == 0 ? 1 : 0;
-        LambdaUpdateWrapper<StoreUser> queryWrapper = new LambdaUpdateWrapper<>();
-        queryWrapper.eq(StoreUser::getId, storeUser.getId())
-                .set(StoreUser::getStatus, newStatus);
-        int updateCount = storeUserMapper.update(null, queryWrapper);
-        if (updateCount <= 0) {
-            throw new RuntimeException("更新失败");
-        }
-        // 返回更新后的状态，供前端及时展示
-        StoreUserVo vo = new StoreUserVo();
-        vo.setId(storeUser.getId());
-        vo.setStatus(newStatus);
-        vo.setSwitchStatus(newStatus == 0);
-        return R.data(vo);
+        //根据当前状态切另一个状态
+        storeUser.setStatus(storeUser.getStatus() == 0 ? 1 : 0);
+        storeUserMapper.updateById(storeUser);
     }
 
     @Override
     public String exportExcel(String id, String phone, String status, Integer accountType) throws IOException {
+        // 定义格式化模式
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-        // 主账号导出：与 getStoreUserList 主账号分支一致，子账号数量按 store_platform_user_role 统计
-        if (accountType == 1) {
-            LambdaQueryWrapper<StoreUser> wrapper = new LambdaQueryWrapper<>();
-            wrapper.eq(StoreUser::getDeleteFlag, 0)
-                    .like(StringUtils.isNotEmpty(id), StoreUser::getId, id)
-                    .like(StringUtils.isNotEmpty(phone), StoreUser::getPhone, phone)
-                    .eq(StringUtils.isNotEmpty(status), StoreUser::getStatus, status)
-                    .eq(StoreUser::getAccountType, 1)
-                    .orderByDesc(StoreUser::getCreatedTime);
-            List<StoreUser> storeUsers = storeUserMapper.selectList(wrapper);
-            List<StoreUserExcelVo> storeUserExcelVoList = new ArrayList<>();
-            int serialNumber = 0;
-            for (StoreUser storeUser : storeUsers) {
-                StoreUserExcelVo vo = new StoreUserExcelVo();
-                vo.setSerialNumber(++serialNumber);
-                BeanUtils.copyProperties(storeUser, vo);
-                vo.setCreatedTime(storeUser.getCreatedTime() != null ? storeUser.getCreatedTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime().format(formatter) : null);
-                vo.setStatus(storeUser.getStatus() == null ? "" : (storeUser.getStatus() == 0 ? "启用" : "禁用"));
-                vo.setChildAccountCount(countSubAccountUserIdsByStoreId(storeUser.getStoreId(), storeUser.getId()));
-                storeUserExcelVoList.add(vo);
-            }
-            String fileName = UUID.randomUUID().toString().replace("-", "");
-            String filePath = ExcelGenerator.generateExcel(excelPath + excelGeneratePath + fileName + ".xlsx", storeUserExcelVoList, StoreUserExcelVo.class);
-            return aliOSSUtil.uploadFile(new File(filePath), "excel/" + fileName + ".xlsx");
-        }
-        // 子账号导出：与 getStoreUserList 子账号分页一致，每条 store_platform_user_role 为一行（不去重），带主账号 id
-        LambdaQueryWrapper<StorePlatformUserRole> roleWrapper = new LambdaQueryWrapper<>();
-        roleWrapper.eq(StorePlatformUserRole::getDeleteFlag, 0);
-        List<StorePlatformUserRole> userRoles = storePlatformUserRoleMapper.selectList(roleWrapper);
-        if (CollectionUtils.isEmpty(userRoles)) {
-            String fileName = UUID.randomUUID().toString().replace("-", "");
-            String filePath = ExcelGenerator.generateExcel(excelPath + excelGeneratePath + fileName + ".xlsx", new ArrayList<StoreSubExcelVo>(), StoreSubExcelVo.class);
-            return aliOSSUtil.uploadFile(new File(filePath), "excel/" + fileName + ".xlsx");
-        }
-        List<Integer> distinctUserIds = userRoles.stream().map(StorePlatformUserRole::getUserId).filter(Objects::nonNull).distinct().collect(Collectors.toList());
-        List<StoreUser> subAccountList = distinctUserIds.isEmpty() ? Collections.emptyList() : storeUserMapper.selectBatchIds(distinctUserIds);
-        Map<Integer, StoreUser> subAccountMap = subAccountList == null ? new HashMap<>() : subAccountList.stream().filter(u -> u.getDeleteFlag() != null && u.getDeleteFlag() == 0).collect(Collectors.toMap(StoreUser::getId, u -> u, (a, b) -> a));
-        List<StorePlatformUserRole> filteredRoles = new ArrayList<>();
-        for (StorePlatformUserRole role : userRoles) {
-            StoreUser subAccount = subAccountMap.get(role.getUserId());
-            if (subAccount == null) continue;
-            if (StringUtils.isNotEmpty(id) && (subAccount.getId() == null || !String.valueOf(subAccount.getId()).contains(id))) continue;
-            if (StringUtils.isNotEmpty(phone) && (subAccount.getPhone() == null || !subAccount.getPhone().contains(phone))) continue;
-            if (status != null && !status.equals(subAccount.getStatus())) continue;
-            filteredRoles.add(role);
+        if (accountType==1){
+        List<StoreUser> storeUsers = storeUserMapper.selectList(
+                new LambdaQueryWrapper<StoreUser>()
+                        .like(StringUtils.isNotEmpty(id), StoreUser::getId, id)
+                        .like(StringUtils.isNotEmpty(phone), StoreUser::getPhone, phone)
+                        .eq(StringUtils.isNotEmpty(status), StoreUser::getStatus, status)
+                        .eq(StoreUser::getAccountType, 1)
+                        .orderByDesc(StoreUser::getCreatedTime)
+        );
+
+        List<StoreUserExcelVo> storeUserExcelVoList = new ArrayList<>();
+        int serialNumber = 0;
+        for (StoreUser storeUser : storeUsers) {
+            StoreUserExcelVo storeUserExcelVo = new StoreUserExcelVo();
+            storeUserExcelVo.setSerialNumber(++serialNumber);
+
+            Integer currentUserId = storeUser.getId();
+            BeanUtils.copyProperties(storeUser, storeUserExcelVo);
+            Instant instant = storeUser.getCreatedTime().toInstant();
+            // 格式化时间
+            String formattedTime = instant.atZone(ZoneId.systemDefault()).toLocalDateTime().format(formatter);
+            storeUserExcelVo.setCreatedTime(formattedTime);
+            //格式化状态
+            storeUserExcelVo.setStatus(storeUser.getStatus() == 0 ? "启用" : "禁用");
+            List<StoreUser> childAccounts = getChildAccountsByParentId(String.valueOf(currentUserId));
+            Integer childCount = childAccounts != null ? childAccounts.size() : 0;
+            storeUserExcelVo.setChildAccountCount(childCount);
+            storeUserExcelVoList.add(storeUserExcelVo);
         }
-        filteredRoles.sort(Comparator.comparing(StorePlatformUserRole::getId, Comparator.nullsLast(Comparator.naturalOrder())));
-        List<Integer> storeIds = filteredRoles.stream().map(StorePlatformUserRole::getStoreId).filter(Objects::nonNull).distinct().collect(Collectors.toList());
-        Map<Integer, StoreUser> mainAccountMap = new HashMap<>();
-        if (!storeIds.isEmpty()) {
-            LambdaQueryWrapper<StoreUser> mainW = new LambdaQueryWrapper<>();
-            mainW.eq(StoreUser::getAccountType, 1).eq(StoreUser::getDeleteFlag, 0).in(StoreUser::getStoreId, storeIds);
-            List<StoreUser> mains = storeUserMapper.selectList(mainW);
-            if (mains != null) mains.forEach(m -> mainAccountMap.put(m.getStoreId(), m));
+        String fileName = UUID.randomUUID().toString().replace("-", "");
+        String filePath = ExcelGenerator.generateExcel(excelPath + excelGeneratePath + fileName + ".xlsx", storeUserExcelVoList, StoreUserExcelVo.class);
+        return aliOSSUtil.uploadFile(new File(filePath), "excel/" + fileName + ".xlsx");
         }
-        List<StoreSubExcelVo> storeSubExcelVoList = new ArrayList<>();
+        List<StoreUser> storeUsers = storeUserMapper.selectList(
+                new LambdaQueryWrapper<StoreUser>()
+                        .like(StringUtils.isNotEmpty(id), StoreUser::getId, id)
+                        .like(StringUtils.isNotEmpty(phone), StoreUser::getPhone, phone)
+                        .eq(StringUtils.isNotEmpty(status), StoreUser::getStatus, status)
+                        .eq(StoreUser::getAccountType, 2)
+                        .orderByDesc(StoreUser::getCreatedTime)
+        );
+        List<StoreSubExcelVo> storeUserExcelVoList = new ArrayList<>();
         int serialNumber = 0;
-        for (StorePlatformUserRole role : filteredRoles) {
-            StoreUser subAccount = subAccountMap.get(role.getUserId());
-            if (subAccount == null) continue;
-            StoreSubExcelVo vo = new StoreSubExcelVo();
-            vo.setSerialNumber(++serialNumber);
-            vo.setId(subAccount.getId());
-            vo.setPhone(subAccount.getPhone());
-            vo.setCreatedTime(subAccount.getCreatedTime() != null ? subAccount.getCreatedTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime().format(formatter) : null);
-            vo.setStatus(subAccount.getStatus() == null ? "" : (subAccount.getStatus() == 0 ? "启用" : "禁用"));
-            StoreUser mainAccount = role.getStoreId() == null ? null : mainAccountMap.get(role.getStoreId());
-            if (mainAccount != null) {
-                vo.setParentAccountPhone(mainAccount.getPhone());
+        for (StoreUser subAccount : storeUsers) {
+            StoreSubExcelVo storeUserExcelVo = new StoreSubExcelVo();
+            storeUserExcelVo.setSerialNumber(++serialNumber);
+            BeanUtils.copyProperties(subAccount, storeUserExcelVo);
+            if (subAccount.getSubAccountId() != null){
+                StoreUser mainAccount = storeUserMapper.selectById(subAccount.getSubAccountId());
+                if (mainAccount != null){
+                    storeUserExcelVo.setId(mainAccount.getId());
+                    storeUserExcelVo.setParentAccountPhone(mainAccount.getPhone());
+                }
             }
-            storeSubExcelVoList.add(vo);
+
+            Instant instant = subAccount.getCreatedTime().toInstant();
+            // 格式化时间
+            String formattedTime = instant.atZone(ZoneId.systemDefault()).toLocalDateTime().format(formatter);
+            storeUserExcelVo.setCreatedTime(formattedTime);
+            //格式化状态
+            storeUserExcelVo.setStatus(subAccount.getStatus() == 0 ? "启用" : "禁用");
+            storeUserExcelVoList.add(storeUserExcelVo);
         }
         String fileName = UUID.randomUUID().toString().replace("-", "");
-        String filePath = ExcelGenerator.generateExcel(excelPath + excelGeneratePath + fileName + ".xlsx", storeSubExcelVoList, StoreSubExcelVo.class);
+        String filePath = ExcelGenerator.generateExcel(excelPath + excelGeneratePath + fileName + ".xlsx", storeUserExcelVoList, StoreSubExcelVo.class);
         return aliOSSUtil.uploadFile(new File(filePath), "excel/" + fileName + ".xlsx");
-
     }