From 4c09f65e57307393da96bc1820a9c320521d18e9 Mon Sep 17 00:00:00 2001
From: woody <woody@163>
Date: Tue, 30 Sep 2025 11:19:01 +0800
Subject: [PATCH] =?UTF-8?q?feat(RetailMemberVO):=20=E4=BC=9A=E5=91=98?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E9=A1=B5=E5=AF=BC=E5=87=BA=E7=A7=BB=E9=99=A4?=
 =?UTF-8?q?=E6=94=B6=E7=9B=8A=E5=8C=BA=E5=9F=9F=E5=AD=97=E6=AE=B5=EF=BC=8C?=
 =?UTF-8?q?=E6=B3=A8=E5=86=8C=E4=B8=9A=E7=BB=A9=E7=A7=BB=E9=99=A4=E8=B4=A7?=
 =?UTF-8?q?=E5=B8=81=E7=AC=A6=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hzs/member/base/vo/RetailMemberVO.java    | 21 +------------------
 .../mapper/member/base/CuMemberMapper.xml     | 20 +-----------------
 2 files changed, 2 insertions(+), 39 deletions(-)

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 @@
         <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