diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/CuMemberController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/CuMemberController.java index dc3881f7..ba7b7da6 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/CuMemberController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/CuMemberController.java @@ -823,4 +823,25 @@ public class CuMemberController extends BaseController { return AjaxResult.success(getDataTable(list)); } + /** + * + * @param memberCode + * @param memberSettlePeriodId + * @return + */ + @Log(module = EOperationModule.MEMBER_POINT, business = EOperationBusiness.MEMBER_POINT, method = EOperationMethod.SELECT) + @PostMapping("/member-point-export") + public void memberPointExport(@RequestParam String memberCode,@RequestParam Long memberSettlePeriodId, HttpServletResponse response) { + CuMemberSettlePeriod csPeriod = iCuMemberSettlePeriodService.getById(memberSettlePeriodId); + log.info("会员结算表信息{}",csPeriod); + String settleTableName = TableNameConstants.CU_MEMBER_RETAIL_RANGE + csPeriod.getPkId(); + log.info("会员结算表名称{}",settleTableName); + List list = iCuMemberRetailService.getMemberPointByMemberCode(settleTableName,memberCode); + list.forEach(item -> { + item.setMemberSettlePeriod(csPeriod.getSettleDate()); + }); + ExcelUtil util = new ExcelUtil<>(memberPointVO.class); + util.exportExcel(response, list, "会员点位信息"); + } + } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/memberPointVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/memberPointVO.java index 676f4e52..3f6d29af 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/memberPointVO.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/memberPointVO.java @@ -1,6 +1,7 @@ package com.hzs.member.base.vo; import com.fasterxml.jackson.annotation.JsonFormat; +import com.hzs.common.core.annotation.Excel; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -14,26 +15,32 @@ public class memberPointVO { /** * 会员编号 */ + @Excel(name = "会员编号") private String memberCode; /** * 会员姓名 */ + @Excel(name = "会员姓名") private String memberName; /** * 子点位总数 */ + @Excel(name = "子点位总数") private Integer pointCount; /** * 待激活点位数 */ + @Excel(name = "待激活点位数") private Integer waitPointCount; /** * 复购业绩余额 */ + @Excel(name = "复购业绩余额") private Long repPvBalance; /** * 期数 */ + @Excel(name = "期数",dateFormat = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd") private Date memberSettlePeriod; }