feat(RetailMemberVO): 会员信息页导出移除收益区域字段,注册业绩移除货币符号

This commit is contained in:
woody 2025-09-30 11:19:01 +08:00 committed by cabbage
parent ceadd71b51
commit 4c09f65e57
2 changed files with 2 additions and 39 deletions

View File

@ -118,7 +118,7 @@ public class RetailMemberVO implements Serializable {
/** /**
* 消费业绩 注册业绩 * 消费业绩 注册业绩
*/ */
@Excel(name = "注册业绩($)") @Excel(name = "注册业绩")
private BigDecimal consumeAchieve; private BigDecimal consumeAchieve;
/** /**
* 隶属体系 * 隶属体系
@ -161,26 +161,7 @@ public class RetailMemberVO implements Serializable {
private String memberAccountVal; private String memberAccountVal;
@Excel(name = "收益状态") @Excel(name = "收益状态")
private String incomeStatusVal; 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;
/** /**
* 创建时间 * 创建时间
*/ */

View File

@ -1993,10 +1993,7 @@
awar.awards_name as pkRangeAwardsVal, awar.awards_name as pkRangeAwardsVal,
awm.awards_name as pkMaxAwardsVal, awm.awards_name as pkMaxAwardsVal,
par.member_code parMemberCode, par.member_code parMemberCode,
par.member_name parMemberName, par.member_name parMemberName
pr.NAME giftProvince,
cty.NAME giftCity,
con.NAME giftCounty
FROM cu_member cm FROM cu_member cm
inner join CU_MEMBER_ACCOUNT cma inner join CU_MEMBER_ACCOUNT cma
on cm.pk_id = cma.PK_MEMBER on cm.pk_id = cma.PK_MEMBER
@ -2018,12 +2015,6 @@
on cmt.pk_id = cm.pk_team_code on cmt.pk_id = cm.pk_team_code
left join CU_MEMBER_RETAIL_REGION cmrr left join CU_MEMBER_RETAIL_REGION cmrr
on cm.pk_id = cmrr.PK_MEMBER and cmrr.effective = 0 and cmrr.del_flag = 0 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 WHERE cm.del_flag = 0 and cm.pk_id in
( (
SELECT cm.PK_ID SELECT cm.PK_ID
@ -2146,15 +2137,6 @@
<if test="isConsume != null "> <if test="isConsume != null ">
and cma.IS_CONSUME=#{isConsume} and cma.IS_CONSUME=#{isConsume}
</if> </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"> <if test="vertexList != null and vertexList.size > 0">
and ver.pk_member in and ver.pk_member in