From 84e54d0236f742c1989f2f5fdafe5b2869818bc6 Mon Sep 17 00:00:00 2001 From: zhangheng Date: Wed, 24 Sep 2025 09:59:45 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E7=9B=B4=E6=8E=A8=E5=8D=87=E7=BA=A7?= =?UTF-8?q?=E6=95=B0=E6=8D=AE,=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AcRecommendConfigController.java | 11 ++++ .../dto/AcDirectPushUpgradeListDTO.java | 59 +++++++++++++++++++ .../mapper/AcRecomUpgradeRecordMapper.java | 3 +- .../impl/AcRecomUpgradeRecordServiceImpl.java | 15 ++++- .../recommend/AcRecomUpgradeRecordMapper.xml | 11 ++-- .../com/hzs/common/core/enums/EGrade.java | 9 +++ 6 files changed, 101 insertions(+), 7 deletions(-) create mode 100644 bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/dto/AcDirectPushUpgradeListDTO.java diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/controller/AcRecommendConfigController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/controller/AcRecommendConfigController.java index 474565f7..4c12a4e7 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/controller/AcRecommendConfigController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/controller/AcRecommendConfigController.java @@ -8,7 +8,10 @@ import com.hzs.activity.recommend.param.AcDirectPushUpgradeParam; import com.hzs.activity.recommend.param.AcRecommendParam; import com.hzs.activity.recommend.service.IAcRecomUpgradeRecordService; import com.hzs.activity.recommend.service.IAcRepurCouponsRuleConfigService; +import com.hzs.activity.recommend.vo.AcDirectPushUpgradeListVO; import com.hzs.activity.recommend.vo.AcRecommendVO; +import com.hzs.activity.tourism.param.TourismDataParam; +import com.hzs.activity.tourism.vo.TourismDataVo; import com.hzs.common.core.annotation.Log; import com.hzs.common.core.enums.EActType; import com.hzs.common.core.enums.EOperationBusiness; @@ -91,6 +94,14 @@ public class AcRecommendConfigController extends BaseController { return getDataTable(iAcRecomUpgradeRecordService.queryList(param)); } + @PostMapping("/directPushUpgradeExport") + public void export(AcDirectPushUpgradeListParam param, HttpServletResponse response) { + startPage(); + List list = iAcRecomUpgradeRecordService.queryList(param); + ExcelUtil util = new ExcelUtil<>(AcDirectPushUpgradeListVO.class); + util.exportExcel(response, list, "直推升级数据导出"); + } + /** * 直推赠送查看详情 diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/dto/AcDirectPushUpgradeListDTO.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/dto/AcDirectPushUpgradeListDTO.java new file mode 100644 index 00000000..7679d1e6 --- /dev/null +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/dto/AcDirectPushUpgradeListDTO.java @@ -0,0 +1,59 @@ +package com.hzs.activity.recommend.dto; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.hzs.common.core.annotation.Excel; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class AcDirectPushUpgradeListDTO { + + /** + * 活动名称 + */ + private String actName; + /** + * 会员编号 + */ + private String memberCode; + /** + * 会员名称 + */ + private String memberName; + + /** + * 原等级 + */ + private Integer pkSettleGrade; + /** + * 新等级 + */ + private Integer pkRecommendGrade; + + /** + * 活动开始时间 + */ + private Date actStartDate; + + /** + * 活动结束时间 + */ + private Date actEndDate; + + /** + * 创建时间 + */ + private Date creationTime; + + /** + * 升级年月 + */ + private String upgradeTime; + +} diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/mapper/AcRecomUpgradeRecordMapper.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/mapper/AcRecomUpgradeRecordMapper.java index 1a4eb4f3..83f4c321 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/mapper/AcRecomUpgradeRecordMapper.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/mapper/AcRecomUpgradeRecordMapper.java @@ -1,6 +1,7 @@ package com.hzs.activity.recommend.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.hzs.activity.recommend.dto.AcDirectPushUpgradeListDTO; import com.hzs.activity.recommend.param.AcDirectPushUpgradeListParam; import com.hzs.activity.recommend.vo.AcDirectPushUpgradeListVO; import com.hzs.common.domain.activity.recommend.AcRecomUpgradeRecord; @@ -41,5 +42,5 @@ public interface AcRecomUpgradeRecordMapper extends BaseMapper queryList(AcDirectPushUpgradeListParam param); + List queryList(AcDirectPushUpgradeListParam param); } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/service/impl/AcRecomUpgradeRecordServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/service/impl/AcRecomUpgradeRecordServiceImpl.java index 5c6d80d8..2c8eed64 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/service/impl/AcRecomUpgradeRecordServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/service/impl/AcRecomUpgradeRecordServiceImpl.java @@ -1,18 +1,23 @@ package com.hzs.activity.recommend.service.impl; +import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.hzs.activity.recommend.dto.AcDirectPushUpgradeListDTO; import com.hzs.activity.recommend.mapper.AcRecomUpgradeRecordMapper; import com.hzs.activity.recommend.param.AcDirectPushUpgradeListParam; import com.hzs.activity.recommend.service.IAcRecomUpgradeRecordService; import com.hzs.activity.recommend.vo.AcDirectPushUpgradeListVO; import com.hzs.common.core.enums.EDelFlag; +import com.hzs.common.core.enums.EGrade; +import com.hzs.common.core.utils.bean.BeanUtils; import com.hzs.common.core.web.page.TableDataInfo; import com.hzs.common.domain.activity.recommend.AcRecomUpgradeRecord; import com.hzs.common.domain.activity.recommend.AcRecomUpgradeRecordExt; import com.hzs.common.domain.sale.order.SaOrder; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -58,7 +63,15 @@ public class AcRecomUpgradeRecordServiceImpl extends ServiceImpl queryList(AcDirectPushUpgradeListParam param) { - return baseMapper.queryList(param); + List acDirectPushUpgradeListDTOS = baseMapper.queryList(param); + ArrayList acDirectPushUpgradeListVOS = new ArrayList<>(); + acDirectPushUpgradeListDTOS.forEach(item -> { + AcDirectPushUpgradeListVO acDirectPushUpgradeListVO = BeanUtil.copyProperties(item, AcDirectPushUpgradeListVO.class); + acDirectPushUpgradeListVO.setPkSettleGrade(EGrade.getGradeByIndex(item.getPkSettleGrade()).getLabel()); + acDirectPushUpgradeListVO.setPkRecommendGrade(EGrade.getGradeByIndex(item.getPkRecommendGrade()).getLabel()); + acDirectPushUpgradeListVOS.add(acDirectPushUpgradeListVO); + }); + return acDirectPushUpgradeListVOS; } } diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/activity/recommend/AcRecomUpgradeRecordMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/activity/recommend/AcRecomUpgradeRecordMapper.xml index 1f4079d7..19215d02 100644 --- a/bd-business/bd-business-sale/src/main/resources/mapper/activity/recommend/AcRecomUpgradeRecordMapper.xml +++ b/bd-business/bd-business-sale/src/main/resources/mapper/activity/recommend/AcRecomUpgradeRecordMapper.xml @@ -61,11 +61,11 @@ ) t where #{num} >= rownum - SELECT abc.ACT_NAME, - cm.member_code, - cm.member_name, + cmm.member_code, + cmm.member_name, arur.PK_SETTLE_GRADE, arur.PK_RECOMMEND_GRADE, abc.ACT_START_DATE, @@ -75,13 +75,14 @@ FROM AC_RECOM_UPGRADE_RECORD arur LEFT JOIN AC_BASE_CONFIG abc ON arur.PK_BASE_ID = abc.PK_ID - LEFT JOIN CU_MEMBER cm ON arur.pk_member = cm.pk_id + LEFT JOIN CU_MEMBER cm ON arur.pk_member = cm.PK_PARENT + LEFT JOIN CU_MEMBER cmm ON cm.PK_PARENT = cmm.PK_ID WHERE arur.DEL_FLAG = 0 AND abc.ACT_NAME = #{actName} - AND cm.member_code = #{memberCode} + AND cmm.member_code = #{memberCode} AND abc.ACT_START_DATE >= #{startActStartDate} diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EGrade.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EGrade.java index 8e1b9b53..3c23ad4e 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EGrade.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EGrade.java @@ -94,4 +94,13 @@ public enum EGrade { return null; } + public static EGrade getGradeByIndex(int value){ + for (EGrade eGrade : EGrade.values()) { + if (value == eGrade.index){ + return eGrade; + } + } + return null; + } + }