From c984867e4ec50251409896010f07793da79654e0 Mon Sep 17 00:00:00 2001 From: gong <1157756119@qq.com> Date: Wed, 28 Jan 2026 13:57:30 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E6=8E=A5=E5=8F=A31?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../czg/controller/admin/ShopUserController.java | 6 ++++++ .../service/impl/AShopUserServiceImpl.java | 15 ++++----------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopUserController.java b/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopUserController.java index 68f81cf7d..e8e9daae5 100644 --- a/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopUserController.java +++ b/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopUserController.java @@ -97,6 +97,12 @@ public class ShopUserController { return CzgResult.success(shopUserService.getPage(key, isVip, amount)); } + /** + * 导出用户列表 + * + * @param key 昵称或手机号 + * @param isVip 0 非vip 1 vip + */ @GetMapping("/export") public void exportUserList(String key, Integer isVip, HttpServletResponse response) { shopUserService.exportUserList(key, isVip, response); diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AShopUserServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AShopUserServiceImpl.java index 159b344c2..e70795843 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AShopUserServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AShopUserServiceImpl.java @@ -3,8 +3,8 @@ package com.czg.service.account.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson2.JSONObject; import com.czg.account.dto.shopuser.*; +import com.czg.account.entity.ShopInfo; import com.czg.account.entity.ShopUser; import com.czg.account.entity.UserInfo; import com.czg.account.service.AShopUserService; @@ -37,7 +37,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; -import java.util.ArrayList; import java.util.List; @@ -131,19 +130,13 @@ public class AShopUserServiceImpl implements AShopUserService { @Override public void exportUserList(String key, Integer isVip, HttpServletResponse response) { Long mainIdByShopId = shopInfoService.getMainIdByShopId(StpKit.USER.getShopId()); + ShopInfo shopInfo = shopInfoService.getById(StpKit.USER.getShopId()); PageHelper.startPage(PageUtil.buildPageHelp()); List dtoList = shopUserMapper.selectPageByKeyAndIsVip(mainIdByShopId, isVip, key, null); // 将 dtoList 转换为 ShopUserExportDTO 列表 - List exportList = new ArrayList<>(); - for (ShopUserDTO shopUserDTO : dtoList) { - ShopUserExportDTO exportDTO = BeanUtil.copyProperties(shopUserDTO, ShopUserExportDTO.class); - exportDTO.setVipRemark((isVip != null && isVip.equals(1)) ? "是" : "否"); - exportList.add(exportDTO); - } - - log.info(JSONObject.toJSONString(exportList)); - ExcelExportUtil.exportToResponse(exportList, ShopUserExportDTO.class, "店铺用户列表.xlsx", response); + List exportList = BeanUtil.copyToList(dtoList, ShopUserExportDTO.class); + ExcelExportUtil.exportToResponse(exportList, ShopUserExportDTO.class, shopInfo == null ? "店铺用户列表" : shopInfo.getShopName() + "_用户列表", response); }