From ad38d6a86cc21a53e9d3cb737e17fb2b587c91a3 Mon Sep 17 00:00:00 2001
From: sangelxiu1 <15781802@163.com>
Date: Thu, 9 Oct 2025 14:09:21 +0800
Subject: [PATCH] =?UTF-8?q?##=20Opt=20-=20=E5=90=8E=E5=8F=B0=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=94=B6=E7=9B=8A=E5=8C=BA=E5=9F=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/CuMemberRegionServiceImpl.java       |  6 ++++
 .../service/impl/CuMemberServiceImpl.java     | 25 ++++++++++++++-
 .../member/base/CuMemberRegionMapper.xml      |  6 ++--
 .../com/hzs/common/core/enums/EEffective.java | 32 +++++++++++++++++++
 4 files changed, 66 insertions(+), 3 deletions(-)
 create mode 100644 bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EEffective.java

diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberRegionServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberRegionServiceImpl.java
index 2ec33740..33510253 100644
--- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberRegionServiceImpl.java
+++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberRegionServiceImpl.java
@@ -73,6 +73,7 @@ public class CuMemberRegionServiceImpl extends ServiceImpl<CuMemberRegionMapper,
                         .set(CuMemberRegion::getPkModified, param.getPkMember())
                         .set(CuMemberRegion::getModifiedTime, new Date())
                         .set(CuMemberRegion::getEffectiveEndDate, result)
+                        .set(ObjectUtil.isNotEmpty(param.getSource()), CuMemberRegion::getSource, param.getSource())
                 );
             }
             // 新増数据
@@ -88,6 +89,11 @@ public class CuMemberRegionServiceImpl extends ServiceImpl<CuMemberRegionMapper,
             retailRegion.setPkCreator(param.getPkMember());
             Long regionVertexPkId = baseMapper.getRegionVertexPkIdByPkMember(retailRegion.getPkMember());
             retailRegion.setRegionVertexPkId(ObjectUtil.isEmpty(regionVertexPkId) ? 0L : regionVertexPkId);
+            if(ObjectUtil.isNotEmpty(param.getSource())){
+                retailRegion.setSource(param.getSource());
+            }else{
+                retailRegion.setSource(ENoticeWebsiteType.MEMBER.getValue());
+            }
             if (baseMapper.insertData(retailRegion) == 0) {
                 throw new ServiceException("选择区域失败，请刷新后重试");
             }
diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java
index daa90034..86d4f557 100644
--- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java
+++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java
@@ -27,6 +27,7 @@ import com.hzs.common.domain.member.empty.CuMemberEmptyCode;
 import com.hzs.common.domain.member.ext.CuMemberExt;
 import com.hzs.common.domain.member.ext.CuMemberRegionExt;
 import com.hzs.common.domain.member.ext.CuMemberSettleExt;
+import com.hzs.common.domain.member.region.CuMemberRegion;
 import com.hzs.common.domain.sale.wares.BdWaresAuthority;
 import com.hzs.common.domain.system.base.BdArea;
 import com.hzs.common.domain.system.base.BdCountry;
@@ -3432,6 +3433,28 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
                     }
                 }
             }
+        }else{
+            LambdaQueryWrapper<CuMemberRegion> cuMemberRegionLambdaQueryWrapper = new LambdaQueryWrapper<>();
+            cuMemberRegionLambdaQueryWrapper.eq(CuMemberRegion::getPkMember, SecurityUtils.getUserId());
+            cuMemberRegionLambdaQueryWrapper.eq(CuMemberRegion::getDelFlag, EDelFlag.UN_DELETE.getValue());
+            cuMemberRegionLambdaQueryWrapper.eq(CuMemberRegion::getEffective, EEffective.EFFECTIVE.getValue());
+            cuMemberRegionLambdaQueryWrapper.eq(CuMemberRegion::getSource, ENoticeWebsiteType.ADMIN.getValue());
+            int count = iCuMemberRegionService.count(cuMemberRegionLambdaQueryWrapper);
+            if(count > 0){
+                // 后台添加 可查看
+                checkRegionVO.setData(new CheckRegionVO.CheckRegionWrapper());
+                CheckRegionDetailVO regionDetail = baseMapper.getSelectRegionDetail(userId, EAreaType.PROVINCE.getValue());
+                checkRegionVO.setProvince(ObjectUtil.isNotEmpty(regionDetail));
+                checkRegionVO.getData().setProvinceData(regionDetail);
+                regionDetail = baseMapper.getSelectRegionDetail(userId, EAreaType.CITY.getValue());
+                checkRegionVO.setCity(ObjectUtil.isNotEmpty(regionDetail));
+                checkRegionVO.getData().setCityData(regionDetail);
+                regionDetail = baseMapper.getSelectRegionDetail(userId, EAreaType.COUNTY.getValue());
+                checkRegionVO.setCounty(ObjectUtil.isNotEmpty(regionDetail));
+                checkRegionVO.getData().setCountyData(regionDetail);
+                return checkRegionVO;
+            }
+
         }
 //        checkRegionVO.setCounty(true);
 //        checkRegionVO.setCity(true);
@@ -3569,7 +3592,7 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
         }
         param.setPkMember(userId);
         param.setPkCountry(pkCountry);
-        param.setSource(ENoticeWebsiteType.MEMBER.getValue());
+        param.setSource(ENoticeWebsiteType.ADMIN.getValue());
         param.setSystemType(systemType);
 
         String str = iCuMemberRegionService.setRegion(param);
diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberRegionMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberRegionMapper.xml
index 26994263..71fce0f1 100644
--- a/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberRegionMapper.xml
+++ b/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberRegionMapper.xml
@@ -74,7 +74,8 @@
             county,
             creation_time,
             pk_creator,
-            REGION_VERTEX_PK_ID
+            REGION_VERTEX_PK_ID,
+            source
             )
         select cu_member_retail_region_seq.nextval,
                #{retailRegion.pkMember},
@@ -83,7 +84,8 @@
                #{retailRegion.county},
                sysdate,
                #{retailRegion.pkCreator},
-               #{retailRegion.regionVertexPkId}
+               #{retailRegion.regionVertexPkId},
+               #{retailRegion.source}
         from dual
         where not exists(select 1
                          from cu_member_retail_region cmrr
diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EEffective.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EEffective.java
new file mode 100644
index 00000000..5307494c
--- /dev/null
+++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EEffective.java
@@ -0,0 +1,32 @@
+package com.hzs.common.core.enums;
+
+import com.hzs.common.core.constant.EnumsPrefixConstants;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@AllArgsConstructor
+@Getter
+public enum EEffective {
+
+    /**
+     * 生效
+     */
+    EFFECTIVE(0, "生效"),
+
+    /**
+     * 失效
+     */
+    INVALID(1, "失效"),
+
+    ;
+
+    /**
+     * 实际值
+     */
+    private final int value;
+    /**
+     * 显示标签
+     */
+    private final String label;
+
+}