From 7671883c963b39c1d509c50d405ed24704074e25 Mon Sep 17 00:00:00 2001
From: sangelxiu1 <15781802@163.com>
Date: Mon, 28 Jul 2025 15:30:46 +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

---
 .../impl/CuMemberRegionServiceImpl.java       | 19 ++++++++++++-------
 .../mapper/member/base/CuMemberMapper.xml     |  1 +
 .../member/base/CuMemberRegionMapper.xml      |  1 +
 3 files changed, 14 insertions(+), 7 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 bc99d3c8..2ec33740 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
@@ -25,6 +25,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.util.Date;
 import java.util.List;
 
@@ -55,20 +58,22 @@ public class CuMemberRegionServiceImpl extends ServiceImpl<CuMemberRegionMapper,
             }
 
             if (null != param.getPkId()) {
-                // 之前存在数据，将旧数据取消
+                LocalDate previousDay = LocalDate.now().minusDays(1);
+                LocalDateTime previousDayEnd = previousDay.atTime(23, 59, 59);
+                Date result = Date.from(previousDayEnd.atZone(ZoneId.systemDefault()).toInstant());
                 this.update(Wrappers.<CuMemberRegion>lambdaUpdate()
+                                        .eq(CuMemberRegion::getPkId, param.getPkId())
+//                        .eq(CuMemberRegion::getProvince, param.getProvince())
+//                        .eq(CuMemberRegion::getCity, param.getCity())
+//                        .eq(CuMemberRegion::getCounty, param.getCounty())
 //                        .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())
+                        .set(CuMemberRegion::getEffectiveEndDate, result)
                 );
-                return null;
             }
             // 新増数据
             CuMemberRegion retailRegion = CuMemberRegion.builder()
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 2b2f3dcd..fec15a8c 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
@@ -3176,6 +3176,7 @@
                 LEFT JOIN BD_AREA PC ON PC.PK_ID = cmrr.COUNTY AND PC.DEL_FLAG = 0
         where cmrr.del_flag = 0
           AND cmrr.PK_MEMBER IN ( #{userId} )
+          and cmrr.EFFECTIVE = 0
         <if test="type != null and type == 1">
             and cmrr.PROVINCE != 0
             and cmrr.CITY = 0
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 64be2d25..26994263 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
@@ -26,6 +26,7 @@
                                and bax.del_flag = 0
         where cm.del_flag = 0
           and cm.pk_id = #{pkMember}
+        and cmrr.EFFECTIVE = 0
         <if test="type != null and type == 1">
             and cmrr.PROVINCE != 0
             and cmrr.CITY = 0