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 ServiceImpllambdaUpdate() + .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 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 and cmrr.PROVINCE != 0 and cmrr.CITY = 0