From 006b22fd499867f172419dd374fe067a65300263 Mon Sep 17 00:00:00 2001
From: sangelxiu1 <15781802@163.com>
Date: Mon, 28 Jul 2025 13:45:00 +0800
Subject: [PATCH] =?UTF-8?q?##=20Fix=20-=20=E6=94=B6=E7=9B=8A=E5=8C=BA?=
 =?UTF-8?q?=E5=9F=9F=20->=20=E5=8F=AF=E4=BF=AE=E6=94=B9=E5=B7=B2=E9=80=89?=
 =?UTF-8?q?=E5=8C=BA=E5=9F=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/service/impl/CuMemberRegionServiceImpl.java  | 11 ++++++++---
 .../mapper/member/base/CuMemberRegionMapper.xml       |  1 -
 2 files changed, 8 insertions(+), 4 deletions(-)

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 85b52cd0..bc99d3c8 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
@@ -57,13 +57,18 @@ public class CuMemberRegionServiceImpl extends ServiceImpl<CuMemberRegionMapper,
             if (null != param.getPkId()) {
                 // 之前存在数据，将旧数据取消
                 this.update(Wrappers.<CuMemberRegion>lambdaUpdate()
-                        .eq(CuMemberRegion::getPkMember, param.getPkMember())
-                        .eq(CuMemberRegion::getEffective, EYesNo.YES.getIntValue())
+//                        .eq(CuMemberRegion::getPkMember, param.getPkMember())
+                        .eq(CuMemberRegion::getPkId, param.getPkId())
+//                        .eq(CuMemberRegion::getEffective, EYesNo.YES.getIntValue())
 //                        .eq(CuMemberRegion::getSystemType, param.getSystemType())
-                        .set(CuMemberRegion::getEffective, EYesNo.NO.getIntValue())
+//                        .set(CuMemberRegion::getEffective, EYesNo.NO.getIntValue())
                         .set(CuMemberRegion::getPkModified, param.getPkMember())
                         .set(CuMemberRegion::getModifiedTime, new Date())
+                        .set(CuMemberRegion::getProvince, param.getProvince())
+                        .set(CuMemberRegion::getCity, param.getCity())
+                        .set(CuMemberRegion::getCounty, param.getCounty())
                 );
+                return null;
             }
             // 新増数据
             CuMemberRegion retailRegion = CuMemberRegion.builder()
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 98275e29..64be2d25 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
@@ -15,7 +15,6 @@
                  left join cu_member_retail_region cmrr
                            on cmrr.pk_member = cm.pk_id
                                and cmrr.del_flag = 0
-                               and cmrr.effective = 0
                  left join bd_area bap
                            on bap.pk_id = cmrr.province
                                and bap.del_flag = 0