From caaae917f2abf63671318ec1e1c43dbfda672250 Mon Sep 17 00:00:00 2001 From: woody Date: Mon, 21 Apr 2025 17:47:22 +0800 Subject: [PATCH] =?UTF-8?q?feat(CumemberLevel):=20=E4=BC=9A=E5=91=98?= =?UTF-8?q?=E5=8D=87=E7=BA=A7=E8=AE=B0=E5=BD=95=E6=B7=BB=E5=8A=A0=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/CuMemberLevelController.java | 37 +++++++++++++- .../member/detail/vo/CuMemberLevelUpVO.java | 50 +++++++++++++++++++ .../common/core/enums/EOperationBusiness.java | 2 +- .../common/core/enums/EOperationModule.java | 1 + .../hzs/common/core/enums/EUpgradeType.java | 25 ++++++++-- 5 files changed, 108 insertions(+), 7 deletions(-) create mode 100644 hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/vo/CuMemberLevelUpVO.java diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/controller/manage/CuMemberLevelController.java b/hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/controller/manage/CuMemberLevelController.java index 1d75a4e1..9d93fb3a 100644 --- a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/controller/manage/CuMemberLevelController.java +++ b/hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/controller/manage/CuMemberLevelController.java @@ -1,15 +1,28 @@ package com.hzs.member.detail.controller.manage; +import com.hzs.common.core.annotation.Log; +import com.hzs.common.core.enums.EOperationBusiness; +import com.hzs.common.core.enums.EOperationMethod; +import com.hzs.common.core.enums.EOperationModule; +import com.hzs.common.core.enums.EUpgradeType; +import com.hzs.common.core.utils.StringUtils; import com.hzs.common.core.web.controller.BaseController; import com.hzs.common.core.web.page.TableDataInfo; import com.hzs.common.domain.member.detail.ext.CuMemberLevelExt; import com.hzs.member.detail.param.CuMemberLevelParam; import com.hzs.member.detail.service.ICuMemberLevelService; +import com.hzs.common.core.utils.poi.ExcelUtil; +import cn.hutool.core.bean.BeanUtil; +import com.hzs.member.detail.vo.CuMemberLevelUpVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; - +import com.hzs.common.core.exception.ServiceException; +import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; +import java.util.HashMap; import java.util.List; /** @@ -32,4 +45,26 @@ public class CuMemberLevelController extends BaseController { return getDataTable(list); } + /** + * 导出升级记录 + **/ + @Log(module = EOperationModule.MEMBER_LEVEL_UP_RECORD, business = EOperationBusiness.MEMBER_LEVEL_UP_RECORD, method = EOperationMethod.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, CuMemberLevelParam param) { + List resultList = new ArrayList<>(); + List list = iCuMemberLevelService.listMemberLevelList(param); + + if (StringUtils.isNotEmpty(list)) { + resultList = BeanUtil.copyToList(list, CuMemberLevelUpVO.class); + for (CuMemberLevelUpVO vo : resultList) { + vo.setUpTypeName(EUpgradeType.getEnumByValue(vo.getUpType()).getLabel()); + } + ExcelUtil util = new ExcelUtil<>(CuMemberLevelUpVO.class); + + util.exportExcel(response, resultList, "会员升级记录"); + } else { + throw new ServiceException("没有数据"); + + } + } } diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/vo/CuMemberLevelUpVO.java b/hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/vo/CuMemberLevelUpVO.java new file mode 100644 index 00000000..fff094fa --- /dev/null +++ b/hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/vo/CuMemberLevelUpVO.java @@ -0,0 +1,50 @@ +package com.hzs.member.detail.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.hzs.common.core.annotation.Excel; +import lombok.Builder; +import lombok.Data; +import java.util.Date; + +@Data +@Builder +public class CuMemberLevelUpVO { + /** + * 会员编号 + */ + @Excel(name = "会员编号") + private String memberCode; + /** + * 会员姓名 + */ + @Excel(name = "会员姓名") + private String memberName; + + /** + * 升级时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "升级时间", dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date upgradeTime; + + /** + * 旧等级 + */ + @Excel(name = "旧等级") + private String gradeNameOld; + + /** + * 新等级 + */ + @Excel(name = "新等级") + private String gradeNameNew; + + /** + * 升级方式 + */ + + private Integer upType; + + @Excel(name = "升级方式") + private String upTypeName; +} diff --git a/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/enums/EOperationBusiness.java b/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/enums/EOperationBusiness.java index 4e18461b..51fdfbc3 100644 --- a/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/enums/EOperationBusiness.java +++ b/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/enums/EOperationBusiness.java @@ -491,7 +491,7 @@ public enum EOperationBusiness { PRODUCT_DETAIL_QUERY_LIST("产品明细查询"), MONTHLY_JOB_LEVEL("月度职级名单查询"), MEMBER_RISK_CONTROL("K值风控设置"), - + MEMBER_LEVEL_UP_RECORD("会员升级记录"), //////////////////////////店铺系统///////////////////////////// SHOP_INFO("店铺"), ; diff --git a/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/enums/EOperationModule.java b/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/enums/EOperationModule.java index 67cc7329..6394013f 100644 --- a/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/enums/EOperationModule.java +++ b/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/enums/EOperationModule.java @@ -520,6 +520,7 @@ public enum EOperationModule { MEMBER_RISK_CONTROL("K值风控设置"), + MEMBER_LEVEL_UP_RECORD("会员升级记录"), SUPPLIER_GOODS("供应商商品"), diff --git a/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/enums/EUpgradeType.java b/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/enums/EUpgradeType.java index b0817e64..36f23ba4 100644 --- a/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/enums/EUpgradeType.java +++ b/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/enums/EUpgradeType.java @@ -17,27 +17,27 @@ public enum EUpgradeType { /** * 1=自动升级 (奖衔),2=手动升级（等级奖衔）,3=购买赠予（奖衔） 4=购买升级（等级前台报单、升级） 5=活动升级（等级） */ - AUTO_UPGRADE(1, "自动升级", 0,EnumsPrefixConstants.UPGRADE_TYPE + 1), + AUTO_UPGRADE(1, "自动升级", 0, EnumsPrefixConstants.UPGRADE_TYPE + 1), /** * 手动升级 */ - MANUAL_UPGRADE(2, "手动升级",0, EnumsPrefixConstants.UPGRADE_TYPE + 2), + MANUAL_UPGRADE(2, "手动升级", 0, EnumsPrefixConstants.UPGRADE_TYPE + 2), /** * 购买赠予 */ - PURCHASE_GIFT(3, "购买赠予", 0,EnumsPrefixConstants.UPGRADE_TYPE + 3), + PURCHASE_GIFT(3, "购买赠予", 0, EnumsPrefixConstants.UPGRADE_TYPE + 3), /** * 购买升级 */ - BUY_UPGRADE(4, "购买升级", 0,EnumsPrefixConstants.UPGRADE_TYPE + 4), + BUY_UPGRADE(4, "购买升级", 0, EnumsPrefixConstants.UPGRADE_TYPE + 4), /** * 活动升级 */ - ACTIVITY_UPGRADE(5, "活动升级", 0,EnumsPrefixConstants.UPGRADE_TYPE + 5), + ACTIVITY_UPGRADE(5, "活动升级", 0, EnumsPrefixConstants.UPGRADE_TYPE + 5), ; @@ -57,4 +57,19 @@ public enum EUpgradeType { * 国际化翻译key值 */ private final String key; + + /** + * 根据枚举值查询枚举 + * + * @param val 枚举值 + * @return + */ + public static EUpgradeType getEnumByValue(int val) { + for (EUpgradeType enums : EUpgradeType.values()) { + if (enums.getValue() == val) { + return enums; + } + } + return AUTO_UPGRADE; + } }