From 9c6510f55da89c9e1567d005c7ca878dfe5866c7 Mon Sep 17 00:00:00 2001 From: zhangheng Date: Tue, 23 Sep 2025 17:56:25 +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?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AcRecommendConfigController.java | 16 +++++ .../mapper/AcRecomUpgradeRecordMapper.java | 3 + .../param/AcDirectPushUpgradeListParam.java | 44 ++++++++++++ .../service/IAcRecomUpgradeRecordService.java | 4 ++ .../impl/AcRecomUpgradeRecordServiceImpl.java | 8 +++ .../vo/AcDirectPushUpgradeListVO.java | 68 +++++++++++++++++++ .../recommend/AcRecomUpgradeRecordMapper.xml | 35 ++++++++++ 7 files changed, 178 insertions(+) create mode 100644 bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/param/AcDirectPushUpgradeListParam.java create mode 100644 bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/vo/AcDirectPushUpgradeListVO.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 e89fbd50..474565f7 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 @@ -3,8 +3,10 @@ package com.hzs.activity.recommend.controller; import com.hzs.activity.base.param.QueryActivityParam; import com.hzs.activity.base.service.IActivityService; import com.hzs.activity.base.vo.BaseConfigVo; +import com.hzs.activity.recommend.param.AcDirectPushUpgradeListParam; 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.AcRecommendVO; import com.hzs.common.core.annotation.Log; @@ -15,6 +17,7 @@ import com.hzs.common.core.enums.EOperationModule; import com.hzs.common.core.utils.poi.ExcelUtil; import com.hzs.common.core.web.controller.BaseController; import com.hzs.common.core.web.domain.AjaxResult; +import com.hzs.common.core.web.page.TableDataInfo; import com.hzs.common.security.service.UserTokenService; import com.hzs.common.security.utils.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -36,6 +39,8 @@ public class AcRecommendConfigController extends BaseController { IAcRepurCouponsRuleConfigService acRepurCouponsRuleConfigService; @Autowired private UserTokenService userTokenService; + @Autowired + private IAcRecomUpgradeRecordService iAcRecomUpgradeRecordService; /** @@ -74,6 +79,17 @@ public class AcRecommendConfigController extends BaseController { } return AjaxResult.success(); } + /** + * + * @param param + * @return + */ + @Log(module = EOperationModule.AC_DIRECT_PUSH_UPGRADE, business = EOperationBusiness.AC_DIRECT_PUSH_UPGRADE, method = EOperationMethod.SELECT, remark = "在线签呈") + @GetMapping("/directPushUpgradeList") + public TableDataInfo directPushUpgradeList(AcDirectPushUpgradeListParam param) { + startPage(); + return getDataTable(iAcRecomUpgradeRecordService.queryList(param)); + } /** 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 35b630d1..36b0ef85 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,8 @@ package com.hzs.activity.recommend.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.hzs.activity.recommend.param.AcDirectPushUpgradeListParam; +import com.hzs.activity.recommend.vo.AcDirectPushUpgradeListVO; import com.hzs.common.domain.activity.recommend.AcRecomUpgradeRecord; import com.hzs.common.domain.activity.recommend.AcRecomUpgradeRecordExt; import com.hzs.common.domain.sale.order.SaOrder; @@ -39,4 +41,5 @@ public interface AcRecomUpgradeRecordMapper extends BaseMapper queryList(AcDirectPushUpgradeListParam param); } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/param/AcDirectPushUpgradeListParam.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/param/AcDirectPushUpgradeListParam.java new file mode 100644 index 00000000..02a88f45 --- /dev/null +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/param/AcDirectPushUpgradeListParam.java @@ -0,0 +1,44 @@ +package com.hzs.activity.recommend.param; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class AcDirectPushUpgradeListParam { + + /** + * 活动名称 + */ + private String actName; + + /** + * 会员编号 + */ + private String memberCode; + + + /** + * 开始活动开始时间 + */ + private Date startActStartDate; + + /** + * 开始活动结束时间 + */ + private Date startActEndDate; + + /** + * 结束活动开始时间 + */ + private Date endActStartDate; + + /** + * 结束活动结束时间 + */ + private Date endActEndDate; +} diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/service/IAcRecomUpgradeRecordService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/service/IAcRecomUpgradeRecordService.java index 1c4ad2dc..9e7b7a89 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/service/IAcRecomUpgradeRecordService.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/service/IAcRecomUpgradeRecordService.java @@ -1,6 +1,9 @@ package com.hzs.activity.recommend.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.hzs.activity.recommend.param.AcDirectPushUpgradeListParam; +import com.hzs.activity.recommend.vo.AcDirectPushUpgradeListVO; +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; @@ -52,4 +55,5 @@ public interface IAcRecomUpgradeRecordService extends IService 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 2b93c026..3dd8a874 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 @@ -3,8 +3,11 @@ package com.hzs.activity.recommend.service.impl; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; 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.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; @@ -53,4 +56,9 @@ public class AcRecomUpgradeRecordServiceImpl extends ServiceImpl queryList(AcDirectPushUpgradeListParam param) { + return baseMapper.queryList(param); + } + } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/vo/AcDirectPushUpgradeListVO.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/vo/AcDirectPushUpgradeListVO.java new file mode 100644 index 00000000..25244b0d --- /dev/null +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/vo/AcDirectPushUpgradeListVO.java @@ -0,0 +1,68 @@ +package com.hzs.activity.recommend.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.hzs.common.core.annotation.Excel; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +@Data +public class AcDirectPushUpgradeListVO { + + /** + * 活动名称 + */ + @Excel(name = "活动名称") + private String actName; + /** + * 会员编号 + */ + @Excel(name = "会员编号") + private String memberCode; + /** + * 会员名称 + */ + @Excel(name = "会员名称") + private String memberName; + + /** + * 原等级 + */ + @Excel(name = "原等级") + private String pkSettleGrade; + /** + * 新等级 + */ + @Excel(name = "新等级") + private String pkRecommendGrade; + + /** + * 活动开始时间 + */ + @Excel(name = "活动开始时间", dateFormat = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date actStartDate; + + /** + * 活动结束时间 + */ + @Excel(name = "活动结束时间", dateFormat = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date actEndDate; + + /** + * 创建时间 + */ + @Excel(name = "创建时间", dateFormat = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date creationTime; + + /** + * 升级年月 + */ + @Excel(name = "创建时间", dateFormat = "yyyy-MM-dd") + private String upgradeTime; + +} 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 95d548ca..f1eafbb9 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 @@ -59,5 +59,40 @@ group by so.pk_reference having count(so.pk_reference) >= #{num} +