## 会员考核列表;

This commit is contained in:
cabbage 2025-07-30 09:29:58 +08:00
parent db0e0473a8
commit 3cd101971e
16 changed files with 272 additions and 108 deletions

View File

@ -0,0 +1,55 @@
package com.hzs.member.detail.controller.manage;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil;
import com.hzs.common.core.enums.EAssessStatus;
import com.hzs.common.core.enums.EAssessmentType;
import com.hzs.common.core.web.controller.BaseController;
import com.hzs.common.core.web.page.TableDataInfo;
import com.hzs.common.domain.member.ext.CuMemberAssessExt;
import com.hzs.member.detail.param.MemberAssessParam;
import com.hzs.member.detail.service.ICuMemberAssessService;
import com.hzs.member.detail.vo.MemberAssessVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
import java.util.List;
/**
* 会员考核控制器
*/
@RestController
@RequestMapping("/manager/member-assess")
public class CuMemberAssessController extends BaseController {
@Autowired
private ICuMemberAssessService iCuMemberAssessService;
/**
* 会员考核列表
*
* @param param
* @return
*/
@GetMapping("/assess-list")
public TableDataInfo assessList(MemberAssessParam param) {
startPage();
List<MemberAssessVO> resultList = new ArrayList<>();
List<CuMemberAssessExt> list = iCuMemberAssessService.listMemberAssess(param);
if (CollectionUtil.isNotEmpty(list)) {
for (CuMemberAssessExt cuMemberAssessExt : list) {
MemberAssessVO memberAssessVO = BeanUtil.copyProperties(cuMemberAssessExt, MemberAssessVO.class);
memberAssessVO.setAssessTypeVal(EAssessmentType.getLabelByValue(memberAssessVO.getAssessType()));
memberAssessVO.setAssessStatusVal(EAssessStatus.getLabelByValue(memberAssessVO.getAssessStatus()));
resultList.add(memberAssessVO);
}
}
TableDataInfo tableDataInfo = getDataTable(list);
tableDataInfo.setRows(resultList);
return tableDataInfo;
}
}

View File

@ -13,9 +13,6 @@ import java.util.List;
/**
* 会员注册权限修改记录表 前端控制器
*
* @author zhangjing
* @since 2022-10-20
*/
@RestController
@RequestMapping("/manager/member-authority")

View File

@ -2,6 +2,8 @@ package com.hzs.member.detail.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.hzs.common.domain.member.detail.CuMemberAssess;
import com.hzs.common.domain.member.ext.CuMemberAssessExt;
import com.hzs.member.detail.param.MemberAssessParam;
import com.hzs.member.detail.vo.CuMemberAssessVO;
import org.apache.ibatis.annotations.Param;
@ -33,7 +35,8 @@ public interface CuMemberAssessMapper extends BaseMapper<CuMemberAssess> {
);
/**
* @description: 查询会员月度考核
* 查询会员月度考核
*
* @param: [tableName, cuMemberAssessVO]
* @return: java.util.List<com.hzs.member.detail.vo.CuMemberAssessVO>
**/
@ -46,10 +49,19 @@ public interface CuMemberAssessMapper extends BaseMapper<CuMemberAssess> {
/**
* @description: 查询会员订单考核积分
* 查询会员订单考核积分
*
* @param: [cuMemberAssessVO]
* @return: java.util.List<com.hzs.member.detail.vo.CuMemberAssessVO>
**/
CuMemberAssessVO getOrderAssessList(CuMemberAssessVO cuMemberAssessVO);
/**
* 会员考核列表
*
* @param param
* @return
*/
List<CuMemberAssessExt> listMemberAssess(@Param("param") MemberAssessParam param);
}

View File

@ -1,6 +1,5 @@
package com.hzs.member.detail.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.hzs.common.domain.member.detail.CuMemberAuthority;
import com.hzs.member.param.CuMemberAuthorityParam;
@ -8,21 +7,12 @@ import com.hzs.member.param.CuMemberAuthorityParam;
import java.util.List;
/**
* <p>
* 会员注册权限修改记录表 Mapper 接口
* </p>
*
* @author zhangjing
* @since 2022-10-20
*/
public interface CuMemberAuthorityMapper extends BaseMapper<CuMemberAuthority> {
/**
* @description: 查询修改注册权限列表
* @author: zhang jing
* @date: 2022/10/20 10:32
* @param: [memberAuthorityParam]
* @return: java.util.List<com.hzs.member.param.CuMemberAuthorityParam>
* 查询修改注册权限列表
**/
List<CuMemberAuthorityParam> selectCuMemberAuthorityList(CuMemberAuthorityParam memberAuthorityParam);
List<CuMemberAuthorityParam> selectCuMemberAuthorityList(CuMemberAuthorityParam memberAuthorityParam);
}

View File

@ -0,0 +1,31 @@
package com.hzs.member.detail.param;
import lombok.Data;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.util.List;
/**
* 会员考核查询入参
*/
@Data
public class MemberAssessParam implements Serializable {
/**
* 查询年月
*/
@NotNull(message = "考核时间不能为空")
private String dateStr;
/**
* 会员编号
*/
private String memberCode;
/**
* 考核类型
*/
private List<Integer> assessTypeList;
}

View File

@ -2,6 +2,8 @@ package com.hzs.member.detail.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.hzs.common.domain.member.detail.CuMemberAssess;
import com.hzs.common.domain.member.ext.CuMemberAssessExt;
import com.hzs.member.detail.param.MemberAssessParam;
import com.hzs.member.detail.vo.CuMemberAssessVO;
import java.util.List;
@ -12,24 +14,35 @@ import java.util.List;
public interface ICuMemberAssessService extends IService<CuMemberAssess> {
/**
* @description: 会员-考核明细列表
* 会员-考核明细列表
*
* @param: [cuMemberAssessVO]
* @return: java.util.List<com.hzs.member.detail.vo.CuMemberAssessVO>
**/
List<CuMemberAssessVO> selectAssessList(CuMemberAssessVO cuMemberAssessVO, List<Integer> orderTypeList);
/**
* @description: 查询会员月度考核查询列表用
* 查询会员月度考核查询列表用
*
* @param: [cuMemberAssessVO]
* @return: java.util.List<com.hzs.member.detail.vo.CuMemberAssessVO>
**/
List<CuMemberAssessVO> getMemberAssessMonthList(CuMemberAssessVO cuMemberAssessVO);
/**
* @description: 查询会员订单考核积分
* 查询会员订单考核积分
*
* @param: [cuMemberAssessVO]
* @return: java.util.List<com.hzs.member.detail.vo.CuMemberAssessVO>
**/
CuMemberAssessVO getOrderAssessList(CuMemberAssessVO cuMemberAssessVO);
/**
* 会员考核列表
*
* @param param
* @return
*/
List<CuMemberAssessExt> listMemberAssess(MemberAssessParam param);
}

View File

@ -1,6 +1,5 @@
package com.hzs.member.detail.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.hzs.common.domain.member.detail.CuMemberAuthority;
import com.hzs.member.param.CuMemberAuthorityParam;
@ -8,21 +7,12 @@ import com.hzs.member.param.CuMemberAuthorityParam;
import java.util.List;
/**
* <p>
* 会员注册权限修改记录表 服务类
* </p>
*
* @author zhangjing
* @since 2022-10-20
*/
public interface ICuMemberAuthorityService extends IService<CuMemberAuthority> {
/**
* @description: 查询修改注册权限列表
* @author: zhang jing
* @date: 2022/10/20 10:32
* @param: [memberAuthorityParam]
* @return: java.util.List<com.hzs.member.param.CuMemberAuthorityParam>
* 查询修改注册权限列表
**/
List<CuMemberAuthorityParam> selectCuMemberAuthorityList(CuMemberAuthorityParam memberAuthorityParam);
}

View File

@ -5,7 +5,9 @@ import com.hzs.common.core.constant.TableNameConstants;
import com.hzs.common.core.utils.DateUtils;
import com.hzs.common.core.utils.StringUtils;
import com.hzs.common.domain.member.detail.CuMemberAssess;
import com.hzs.common.domain.member.ext.CuMemberAssessExt;
import com.hzs.member.detail.mapper.CuMemberAssessMapper;
import com.hzs.member.detail.param.MemberAssessParam;
import com.hzs.member.detail.service.ICuMemberAssessService;
import com.hzs.member.detail.vo.CuMemberAssessVO;
import org.springframework.stereotype.Service;
@ -61,4 +63,9 @@ public class CuMemberAssessServiceImpl extends ServiceImpl<CuMemberAssessMapper,
return baseMapper.getOrderAssessList(cuMemberAssessVO);
}
@Override
public List<CuMemberAssessExt> listMemberAssess(MemberAssessParam param) {
return baseMapper.listMemberAssess(param);
}
}

View File

@ -10,23 +10,11 @@ import org.springframework.stereotype.Service;
import java.util.List;
/**
* <p>
* 会员注册权限修改记录表 服务实现类
* </p>
*
* @author zhangjing
* @since 2022-10-20
*/
@Service
public class CuMemberAuthorityServiceImpl extends ServiceImpl<CuMemberAuthorityMapper, CuMemberAuthority> implements ICuMemberAuthorityService {
/**
* @description: 查询修改注册权限列表
* @author: zhang jing
* @date: 2022/10/20 10:30
* @param: [memberAuthorityParam]
* @return: java.util.List<com.hzs.member.param.CuMemberAuthorityParam>
**/
@Override
public List<CuMemberAuthorityParam> selectCuMemberAuthorityList(CuMemberAuthorityParam memberAuthorityParam) {
return baseMapper.selectCuMemberAuthorityList(memberAuthorityParam);

View File

@ -0,0 +1,60 @@
package com.hzs.member.detail.vo;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.math.BigDecimal;
/**
* 会员考核列表返回VO
*/
@NoArgsConstructor
@AllArgsConstructor
@Data
public class MemberAssessVO implements Serializable {
/**
* 会员编号
*/
private String memberCode;
/**
* 会员姓名
*/
private String memberName;
/**
* 隶属体系
*/
private String vertexName;
/**
* 奖衔名称
*/
private String awardsName;
/**
* 考核类型
*/
private Integer assessType;
private String assessTypeVal;
/**
* 考核状态
*/
private Integer assessStatus;
private String assessStatusVal;
/**
* 考核奖衔
*/
private String assessAwardsName;
/**
* 考核目标
*/
private BigDecimal assessTarget;
/**
* 新増业绩
*/
private BigDecimal monthAdd;
}

View File

@ -2,34 +2,8 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hzs.member.detail.mapper.CuMemberAssessMapper">
<!-- 通用查询映射结果 -->
<resultMap id="CuMemberAssess" type="com.hzs.common.domain.member.ext.CuMemberAssessExt">
<id column="PK_ID" property="pkId"/>
<result column="DEL_FLAG" property="delFlag"/>
<result column="PK_CREATOR" property="pkCreator"/>
<result column="CREATION_TIME" property="creationTime"/>
<result column="PK_MODIFIED" property="pkModified"/>
<result column="MODIFIED_TIME" property="modifiedTime"/>
<result column="PK_COUNTRY" property="pkCountry"/>
<result column="PK_MEMBER" property="pkMember"/>
<result column="PERIOD" property="period"/>
<result column="SETTLE_MONTH" property="settleMonth"/>
<result column="ASSESS_TYPE" property="assessType"/>
<result column="PK_ORIGINAL_AWARDS" property="pkOriginalAwards"/>
<result column="PK_AWARDS" property="pkAwards"/>
<result column="ASSESS_TARGET" property="assessTarget"/>
<result column="IS_EXAMINE" property="isExamine"/>
<result column="ASSESS_STATUS" property="assessStatus"/>
<result column="MONTH_BALANCE" property="monthBalance"/>
<result column="MONTH_ADD" property="monthAdd"/>
<result column="CUR_MONTH_ADD" property="curMonthAdd"/>
<result column="MONTH_USED" property="monthUsed"/>
<result column="MONTH_SURPLUS" property="monthSurplus"/>
</resultMap>
<!-- 会员-考核明细列表-->
<select id="selectAssessList"
resultType="com.hzs.member.detail.vo.CuMemberAssessVO">
<select id="selectAssessList" resultType="com.hzs.member.detail.vo.CuMemberAssessVO">
select * from (
SELECT
a.PK_ASSESS pkAssess,
@ -175,4 +149,34 @@
</if>
</select>
<!-- 会员考核列表 -->
<select id="listMemberAssess" resultType="com.hzs.common.domain.member.ext.CuMemberAssessExt">
select cm.member_code,
cm.member_name,
bv.vertex_name,
ba.awards_name,
baa.awards_name,
cma.*
from CU_MEMBER_ASSESS${param.dateStr} cma
left join cu_member cm
on cm.pk_id = cma.pk_member
left join bd_vertex bv
on bv.pk_id = cm.pk_vertex
left join bd_awards ba
on ba.pk_id = cma.pk_awards
left join bd_awards baa
on baa.pk_id = cma.assess_pk_awards
where cma.del_flag = 0
<if test="param.memberCode != null and param.memberCode != ''">
and cm.member_code like #{param.memberCode} || '%'
</if>
<if test="param.assessTypeList != null and param.assessTypeList.size > 0">
and cma.assess_type in
<foreach collection="param.assessTypeList" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
order by cma.assess_type
</select>
</mapper>

View File

@ -2,31 +2,6 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hzs.member.detail.mapper.CuMemberAuthorityMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.hzs.common.domain.member.detail.CuMemberAuthority">
<id column="PK_ID" property="pkId" />
<result column="DEL_FLAG" property="delFlag" />
<result column="PK_COUNTRY" property="pkCountry" />
<result column="CREATION_TIME" property="creationTime" />
<result column="MODIFIED_TIME" property="modifiedTime" />
<result column="PK_CREATOR" property="pkCreator" />
<result column="PK_MODIFIED" property="pkModified" />
<result column="PK_MEMBER" property="pkMember" />
<result column="AUTHORITY_TYPE" property="authorityType" />
<result column="OLD_VALUE" property="oldValue" />
<result column="NEW_VALUE" property="newValue" />
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
DEL_FLAG,
PK_COUNTRY,
CREATION_TIME,
MODIFIED_TIME,
PK_CREATOR,
PK_MODIFIED,
PK_ID, PK_MEMBER, AUTHORITY_TYPE, OLD_VALUE, NEW_VALUE
</sql>
<!--查询修改注册权限列表-->
<select id="selectCuMemberAuthorityList" parameterType="com.hzs.member.param.CuMemberAuthorityParam"
resultType="com.hzs.member.param.CuMemberAuthorityParam">
@ -45,9 +20,9 @@
b.MEMBER_NAME as memberName,
c.USER_NAME as creator,
c.NICK_NAME as nickName
from CU_MEMBER_AUTHORITY a
from CU_MEMBER_AUTHORITY a
INNER JOIN CU_MEMBER b on a.PK_MEMBER=b.PK_ID
INNER JOIN SYS_USER c on a.PK_CREATOR=c.USER_ID
INNER JOIN SYS_USER c on a.PK_CREATOR=c.USER_ID
where a.DEL_FLAG = 0
<if test="memberCode != null and memberCode != ''">
AND b.MEMBER_CODE like '%' || #{memberCode} || '%'

View File

@ -46,4 +46,17 @@ public enum EAssessStatus {
* 国际化翻译key值
*/
private final String key;
public static String getLabelByValue(Integer value) {
if (null != value) {
for (EAssessStatus enums : EAssessStatus.values()) {
if (enums.getValue() == value) {
return enums.getLabel();
}
}
}
return "";
}
}

View File

@ -13,17 +13,17 @@ public enum EAssessmentType {
/**
* 0=复购考核
*/
REPURCHASE_ASSESS(0, "复购考核", 0),
REPURCHASE_ASSESS(0, "复购考核", 1),
/**
* 1=分红考核
*/
SHARE_ASSESS(1, "分红考核", 0),
SHARE_ASSESS(1, "分红考核", 1),
/**
* 2=不考核
*/
NO_ASSESSMENT(2, "不考核", 0),
NO_ASSESSMENT(2, "不考核", 1),
/**
* 5=见点收益考核
@ -33,15 +33,15 @@ public enum EAssessmentType {
/**
* 6=区域收益省考核
*/
PROVINCE_ASSESS(6, "区域收益省考核", 0),
PROVINCE_ASSESS(6, "区域考核-省", 0),
/**
* 7=区域收益市考核
*/
CITY_ASSESS(7, "区域收益市考核", 0),
CITY_ASSESS(7, "区域考核-市", 0),
/**
* 8=区域收益区考核
*/
COUNTY_ASSESS(8, "区域收益区考核", 0),
COUNTY_ASSESS(8, "区域考核-区", 0),
;
@ -58,4 +58,16 @@ public enum EAssessmentType {
*/
private final int enable;
public static String getLabelByValue(Integer value) {
if (null != value) {
for (EAssessmentType enums : EAssessmentType.values()) {
if (enums.getValue() == value) {
return enums.getLabel();
}
}
}
return "";
}
}

View File

@ -9,12 +9,7 @@ import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* <p>
* 会员注册权限修改记录表
* </p>
*
* @author zhangjing
* @since 2022-10-20
*/
@Data
@EqualsAndHashCode(callSuper = true)

View File

@ -12,4 +12,26 @@ public class CuMemberAssessExt extends CuMemberAssess {
* 原奖衔
*/
private Integer pkOriginalAwards;
/**
* 会员编号
*/
private String memberCode;
/**
* 会员姓名
*/
private String memberName;
/**
* 隶属体系
*/
private String vertexName;
/**
* 奖衔名称
*/
private String awardsName;
/**
* 考核奖衔名称
*/
private String assessAwardsName;
}