angelo
/
java-store-retail-app
forked from angelo/java-retail-app
3
0
Fork 0
Code Pull Requests Activity

feat(CuMember): 会员列表移除奖项及收益区域字段

This commit is contained in:
woody 2025-06-20 17:04:07 +08:00
parent 65d95f3195
commit 38910b22fc
2 changed files with 1 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/RetailMemberVO.java
View File

@ -64,28 +64,6 @@ public class RetailMemberVO implements Serializable {
@Excel(name = "推荐姓名")
private String parMemberName;
/**
* 当月奖衔
*/
private Integer pkAwards;
@Excel(name = "当月奖衔")
private String pkAwardsVal;
/**
* 分红奖衔
*/
private Integer pkRangeAwards;
@Excel(name = "分红奖衔")
private String pkRangeAwardsVal;
/**
* 荣誉奖衔
*/
private Integer pkMaxAwards;
@Excel(name = "荣誉奖衔")
private String pkMaxAwardsVal;
/**
* 订单来源 (1=实单注册,2=空单注册)订单状态 EOrderSource
*/
@ -161,26 +139,6 @@ public class RetailMemberVO implements Serializable {
private String memberAccountVal;
@Excel(name = "收益状态")
private String incomeStatusVal;
/**
* 省
*/
@Excel(name = "收益区省")
private String giftProvince;
private Integer province;
/**
* 市
*/
@Excel(name = "收益区市")
private String giftCity;
private Integer city;
/**
* 县（区）
*/
@Excel(name = "收益区县(区)")
private String giftCounty;
private Integer county;
/**
* 创建时间
*/

38
bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml
View File

@ -2293,25 +2293,13 @@
cmt.team_name as teamName,
gr.grade_name as pkRegisterGradeVal,
grr.grade_name as pkSettleGradeVal,
awa.awards_name as pkAwardsVal,
awar.awards_name as pkRangeAwardsVal,
awm.awards_name as pkMaxAwardsVal,
par.member_code parMemberCode,
par.member_name parMemberName,
pr.NAME giftProvince,
cty.NAME giftCity,
con.NAME giftCounty
par.member_name parMemberName
FROM cu_member cm
inner join CU_MEMBER_ACCOUNT cma
on cm.pk_id = cma.PK_MEMBER
left join cu_member par
ON par.pk_id = cm.pk_parent
left join bd_awards awa
on awa.pk_id = cm.pk_awards
left join bd_awards awar
on awar.pk_id = cm.pk_range_awards
left join bd_awards awm
on awm.pk_id = cm.pk_max_awards
left join bd_grade gr
on gr.pk_id = cm.PK_REGISTER_GRADE
left join bd_grade grr
@ -2322,12 +2310,6 @@
on cmt.pk_id = cm.pk_team_code
left join CU_MEMBER_RETAIL_REGION cmrr
on cm.pk_id = cmrr.PK_MEMBER and cmrr.effective = 0 and cmrr.del_flag = 0
left join BD_AREA pr
on pr.pk_id = cmrr.PROVINCE
left join BD_AREA cty
on cty.pk_id = cmrr.CITY
left join BD_AREA con
on con.pk_id = cmrr.COUNTY
WHERE cm.del_flag = 0 and cm.pk_id in
(
SELECT cm.PK_ID
@ -2417,15 +2399,6 @@
<if test="pkSettleGrade != null ">
and cm.pk_settle_grade = #{pkSettleGrade}
</if>
<if test="pkAwards != null">
and cm.pk_awards = #{pkAwards}
</if>
<if test="pkRangeAwards != null">
and cm.pk_range_awards = #{pkRangeAwards}
</if>
<if test="pkMaxAwards != null">
and cm.pk_max_awards = #{pkMaxAwards}
</if>
<if test="directPushNumber != null">
and cm.DIRECT_PUSH_NUMBER=#{directPushNumber}
</if>
@ -2450,15 +2423,6 @@
<if test="isConsume != null ">
and cma.IS_CONSUME=#{isConsume}
</if>
<if test="province != null">
and cmrr.PROVINCE=#{province}
</if>
<if test="city != null">
and cmrr.CITY=#{city}
</if>
<if test="county != null">
and cmrr.COUNTY=#{county}
</if>
<!-- 体系权限处理 -->
<if test="vertexList != null and vertexList.size > 0">
and ver.pk_member in