Merge remote-tracking branch 'origin/bd_dev' into bd_dev

2025-09-24 09:14:26 +08:00 · 2025-09-24 09:14:26 +08:00 · 7f444421b7
parent ff2f6f30c1 8959ba3663
commit 7f444421b7
7 changed files with 178 additions and 0 deletions
--- 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));
+    }


    /**
--- 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<AcRecomUpgradeRec
                                 @Param("startTime") Date startTime,
                                 @Param("endTime") Date endTime);

+    List<AcDirectPushUpgradeListVO> queryList(AcDirectPushUpgradeListParam param);
 }
--- 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
@ -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;
+}
--- 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<AcRecomUpgradeRec
     */
    List<SaOrder> listRecomOrder(Long pkMember, Integer pkGrade, Integer num, Date startTime, Date endTime);

+    List<AcDirectPushUpgradeListVO> queryList(AcDirectPushUpgradeListParam param);
 }
--- 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<AcRecomUpgradeR
        return baseMapper.listRecomOrder(pkMember, pkGrade, num, startTime, endTime);
    }

+    @Override
+    public List<AcDirectPushUpgradeListVO> queryList(AcDirectPushUpgradeListParam param) {
+        return baseMapper.queryList(param);
+    }
+
 }
--- 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
@ -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;
+
+}
--- 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,5 +61,40 @@
        ) t
        where #{num} >= rownum
    </select>
+      <select id="queryList" resultType="com.hzs.activity.recommend.vo.AcDirectPushUpgradeListVO">
+        SELECT
+        abc.ACT_NAME,
+        cm.member_code,
+        cm.member_name,
+        arur.PK_SETTLE_GRADE,
+        arur.PK_RECOMMEND_GRADE,
+        abc.ACT_START_DATE,
+        abc.ACT_END_DATE,
+        arur.CREATION_TIME,
+        arur.UPGRADE_TIME
+        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
+        WHERE arur.DEL_FLAG = 0
+        <if test="actName != null">
+            AND abc.ACT_NAME = #{actName}
+        </if>
+        <if test="memberCode != null">
+            AND cm.member_code = #{memberCode}
+        </if>
+        <if test="startActStartDate != null">
+            AND abc.ACT_START_DATE >= #{startActStartDate}
+        </if>
+        <if test="startActEndDate != null">
+            AND abc.ACT_START_DATE &lt;= #{startActEndDate}
+        </if>
+        <if test="startActEndDate != null">
+            AND abc.ACT_END_DATE >= #{endActStartDate}
+        </if>
+        <if test="endActStartDate != null">
+            AND abc.ACT_END_DATE &lt;= #{endActEndDate}
+        </if>
+    </select>

 </mapper>