diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/RetailMemberVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/RetailMemberVO.java
index 39db0474..7169ca10 100644
--- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/RetailMemberVO.java
+++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/RetailMemberVO.java
@@ -118,7 +118,7 @@ public class RetailMemberVO implements Serializable {
/**
* 消费业绩 注册业绩
*/
- @Excel(name = "注册业绩($)")
+ @Excel(name = "注册业绩")
private BigDecimal consumeAchieve;
/**
* 隶属体系
@@ -161,26 +161,7 @@ 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;
/**
* 创建时间
*/
diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml
index bea85627..2eb85c36 100644
--- a/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml
+++ b/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml
@@ -1993,10 +1993,7 @@
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
@@ -2018,12 +2015,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
@@ -2146,15 +2137,6 @@
and cma.IS_CONSUME=#{isConsume}
-
- and cmrr.PROVINCE=#{province}
-
-
- and cmrr.CITY=#{city}
-
-
- and cmrr.COUNTY=#{county}
-
and ver.pk_member in