## 直推升级数据,导出会员名称修改
This commit is contained in:
parent
6314e51dcf
commit
970e37cf05
|
|
@ -10,8 +10,6 @@ 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;
|
||||
|
|
|
|||
|
|
@ -1,59 +0,0 @@
|
|||
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;
|
||||
|
||||
}
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
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;
|
||||
|
|
@ -42,5 +41,5 @@ public interface AcRecomUpgradeRecordMapper extends BaseMapper<AcRecomUpgradeRec
|
|||
@Param("startTime") Date startTime,
|
||||
@Param("endTime") Date endTime);
|
||||
|
||||
List<AcDirectPushUpgradeListDTO> queryList(AcDirectPushUpgradeListParam param);
|
||||
List<AcDirectPushUpgradeListVO> queryList(AcDirectPushUpgradeListParam param);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@ 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;
|
||||
|
|
@ -63,15 +62,7 @@ public class AcRecomUpgradeRecordServiceImpl extends ServiceImpl<AcRecomUpgradeR
|
|||
|
||||
@Override
|
||||
public List<AcDirectPushUpgradeListVO> queryList(AcDirectPushUpgradeListParam param) {
|
||||
List<AcDirectPushUpgradeListDTO> acDirectPushUpgradeListDTOS = baseMapper.queryList(param);
|
||||
ArrayList<AcDirectPushUpgradeListVO> 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;
|
||||
return baseMapper.queryList(param);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -61,13 +61,13 @@
|
|||
) t
|
||||
where #{num} >= rownum
|
||||
</select>
|
||||
<select id="queryList" resultType="com.hzs.activity.recommend.dto.AcDirectPushUpgradeListDTO">
|
||||
<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,
|
||||
BG.GRADE_NAME AS pkSettleGrade,
|
||||
BGG.GRADE_NAME AS pkRecommendGrade,
|
||||
abc.ACT_START_DATE,
|
||||
abc.ACT_END_DATE,
|
||||
arur.CREATION_TIME,
|
||||
|
|
@ -76,6 +76,8 @@
|
|||
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 BD_GRADE BG ON arur.PK_SETTLE_GRADE = BG.PK_ID
|
||||
LEFT JOIN BD_GRADE BGG ON arur.PK_RECOMMEND_GRADE = BGG.PK_ID
|
||||
WHERE arur.DEL_FLAG = 0
|
||||
<if test="actName != null">
|
||||
AND abc.ACT_NAME = #{actName}
|
||||
|
|
|
|||
Loading…
Reference in New Issue