From 3a9b7376f2e61b75a93b0680ca464ce44f3f58e9 Mon Sep 17 00:00:00 2001 From: tangqian Date: Fri, 16 Jun 2023 10:37:28 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=8E=A8=E5=B9=BF=E5=91=98=E5=AF=BC?= =?UTF-8?q?=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../framework/common/pojo/PageParam.java | 4 +-- .../mapper/recharge/RechargeOrderMapper.xml | 3 +- .../admin/promoter/PromoterController.java | 31 +++++++++++++++++-- .../admin/promoter/vo/PromoterExcelVO.java | 5 +-- 4 files changed, 34 insertions(+), 9 deletions(-) diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/pojo/PageParam.java b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/pojo/PageParam.java index aedf1af0a..05f341eb7 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/pojo/PageParam.java +++ b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/pojo/PageParam.java @@ -20,10 +20,10 @@ public class PageParam implements Serializable { @Min(value = 1, message = "页码最小值为 1") private Integer pageNo = PAGE_NO; - @Schema(description = "每页条数，最大值为 1000", required = true, example = "10") + @Schema(description = "每页条数，最大值为 10000", required = true, example = "10") @NotNull(message = "每页条数不能为空") @Min(value = 1, message = "每页条数最小值为 1") - @Max(value = 100, message = "每页条数最大值为 1000") + @Max(value = 100, message = "每页条数最大值为 10000") private Integer pageSize = PAGE_SIZE; } diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/recharge/RechargeOrderMapper.xml b/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/recharge/RechargeOrderMapper.xml index 9e8f652c5..9b671cedf 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/recharge/RechargeOrderMapper.xml +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/recharge/RechargeOrderMapper.xml @@ -152,7 +152,7 @@ e.name as tenantName, a.pay_time, a.pay_time as payCompleteTime, - a.real_name, + x.nickname as realName, a.paid, a.user_phone, a.confirm_phone, @@ -168,6 +168,7 @@ left join member_user b on a.promoter_id = b.id left join system_dept d on d.id = a.dept_id left join system_tenant e on e.id = a.tenant_id + left join member_user x on a.uid = x.id diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/promoter/PromoterController.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/promoter/PromoterController.java index 9170321d5..94f19342b 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/promoter/PromoterController.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/promoter/PromoterController.java @@ -5,8 +5,12 @@ import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore; import cn.iocoder.yudao.module.system.enums.common.SexEnum; import com.github.pagehelper.PageInfo; import io.swagger.v3.oas.annotations.Parameters; +import org.apache.commons.collections4.CollectionUtils; +import org.springframework.beans.BeanUtils; import org.springframework.web.bind.annotation.*; + import javax.annotation.Resource; + import org.springframework.validation.annotation.Validated; import org.springframework.security.access.prepost.PreAuthorize; import io.swagger.v3.oas.annotations.tags.Tag; @@ -21,11 +25,13 @@ import java.io.IOException; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.CommonResult; + import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; + import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.*; import cn.iocoder.yudao.module.member.controller.admin.promoter.vo.*; @@ -98,11 +104,12 @@ public class PromoterController { @PreAuthorize("@ss.hasPermission('member:promoter:export')") @OperateLog(type = EXPORT) public void exportPromoterExcel(@Valid PromoterExportReqVO exportReqVO, - HttpServletResponse response) throws IOException { + HttpServletResponse response) throws IOException { List list = promoterService.getPromoterList(exportReqVO); // 导出 Excel ExcelUtils.write(response, "推广员.xls", "数据", PromoterExcelVO.class, list); } + @GetMapping("/get-import-template") @Operation(summary = "获得导入推广员模板") public void importTemplate(HttpServletResponse response) throws IOException { @@ -114,6 +121,7 @@ public class PromoterController { // 输出 ExcelUtils.write(response, "推广员导入模板.xls", "推广员列表", PromoterImportExcelVO.class, list); } + @PostMapping("/import") @Operation(summary = "导入推广员") // @Parameters({ @@ -123,7 +131,7 @@ public class PromoterController { // @PreAuthorize("@ss.hasPermission('system:user:import')") @TenantIgnore public CommonResult importExcel(@RequestParam("file") MultipartFile file, - @RequestParam(value = "updateSupport", required = false, defaultValue = "false") Boolean updateSupport) throws Exception { + @RequestParam(value = "updateSupport", required = false, defaultValue = "false") Boolean updateSupport) throws Exception { List list = ExcelUtils.read(file, PromoterImportExcelVO.class); return success(promoterService.importUserList(list, updateSupport)); } @@ -138,6 +146,25 @@ public class PromoterController { return success(pageResult); } + + @GetMapping("/all-export-excel") + @Operation(summary = "导出所有推广员 Excel") + @OperateLog(type = EXPORT) + public void allExportExcel(@Valid PromoterPageReqVO pageVO, + HttpServletResponse response) throws IOException { + PageResult pageResult = promoterService.getPromoterPage(pageVO); + List list = new ArrayList<>(); + if (CollectionUtils.isNotEmpty(pageResult.getList())) { + pageResult.getList().forEach(e -> { + PromoterExcelVO vo = new PromoterExcelVO(); + BeanUtils.copyProperties(e, vo); + list.add(vo); + }); + } + // 导出 Excel + ExcelUtils.write(response, "推广员.xls", "数据", PromoterExcelVO.class, list); + } + @PutMapping("/tenantIgnoreUpdate") @Operation(summary = "排除祖父更新推广员") @TenantIgnore diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/promoter/vo/PromoterExcelVO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/promoter/vo/PromoterExcelVO.java index 641a446ae..e724f1a6f 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/promoter/vo/PromoterExcelVO.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/promoter/vo/PromoterExcelVO.java @@ -1,10 +1,7 @@ package cn.iocoder.yudao.module.member.controller.admin.promoter.vo; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; - import com.alibaba.excel.annotation.ExcelProperty; +import lombok.Data; /** * 推广员 Excel VO