From 8bea3e39b6a021fd4f0e24b7844c8cc9f533c861 Mon Sep 17 00:00:00 2001
From: sangelxiu1 <15781802@163.com>
Date: Mon, 30 Jun 2025 14:12:04 +0800
Subject: [PATCH] =?UTF-8?q?##=20Opt=20-=20=E5=8C=BA=E5=9F=9F=E4=BD=93?=
 =?UTF-8?q?=E7=B3=BB=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/retail/member/CuMemberRetailRegionMapper.xml  | 9 ++++++++-
 .../base/service/impl/BdRegionVertexServiceImpl.java     | 1 -
 .../retail/member/ext/CuMemberRetailRegionExt.java       | 5 +++++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/bd-business/bd-business-member/src/main/resources/mapper/retail/member/CuMemberRetailRegionMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/retail/member/CuMemberRetailRegionMapper.xml
index 1b379a0d..409ac928 100644
--- a/bd-business/bd-business-member/src/main/resources/mapper/retail/member/CuMemberRetailRegionMapper.xml
+++ b/bd-business/bd-business-member/src/main/resources/mapper/retail/member/CuMemberRetailRegionMapper.xml
@@ -144,7 +144,9 @@
         p.name provinceVal,
         c.name cityVal,
         pc.name countyVal,
-        bg.GRADE_NAME gradeName
+        bg.GRADE_NAME gradeName,
+        brv.pk_id as regionVertexPkId,
+        brv.name as regionVertexName
         FROM CU_MEMBER_RETAIL_REGION CRR
         INNER JOIN CU_MEMBER CM
         ON CRR.PK_MEMBER = CM.PK_ID
@@ -158,6 +160,8 @@
         LEFT JOIN BD_AREA PC
         ON PC.PK_ID = CRR.COUNTY
         AND PC.DEL_FLAG = 0
+        left join BD_REGION_VERTEX brv
+        on brv.pk_id = crr.REGION_VERTEX_PK_ID
         where CRR.DEL_FLAG = 0
         <if test="pkCountry != null">
             and CRR.PK_COUNTRY = #{pkCountry}
@@ -201,6 +205,9 @@
         <if test="source!=null">
             and CRR.source=#{source}
         </if>
+        <if test="regionVertexPkId != null">
+            and brv.pk_id = #{regionVertexPkId}
+        </if>
         order by CRR.CREATION_TIME desc
     </select>
 
diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/impl/BdRegionVertexServiceImpl.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/impl/BdRegionVertexServiceImpl.java
index a6dcb34e..cef2dfc5 100644
--- a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/impl/BdRegionVertexServiceImpl.java
+++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/impl/BdRegionVertexServiceImpl.java
@@ -12,7 +12,6 @@ import com.hzs.system.base.mapper.BdRegionVertexMapper;
 import com.hzs.system.base.service.IBdRegionVertexService;
 import org.springframework.stereotype.Service;
 
-import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/retail/member/ext/CuMemberRetailRegionExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/retail/member/ext/CuMemberRetailRegionExt.java
index d6471e44..c8b05c34 100644
--- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/retail/member/ext/CuMemberRetailRegionExt.java
+++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/retail/member/ext/CuMemberRetailRegionExt.java
@@ -102,4 +102,9 @@ public class CuMemberRetailRegionExt extends CuMemberRetailRegion {
      * 2025年6月11日 是否激活 (0-是, 1-否)
      */
     private Integer isActivate;
+
+    /**
+     * 2025年6月30日 区域体系分组名称
+     */
+    private String regionVertexName;
 }