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 and CRR.PK_COUNTRY = #{pkCountry} @@ -201,6 +205,9 @@ and CRR.source=#{source} + + and brv.pk_id = #{regionVertexPkId} + order by CRR.CREATION_TIME desc 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 67e23529..4be93d1b 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; }