angelo
/
java-base-app
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

## Fix - 收益区域 -> 可修改已选区域

This commit is contained in:
sangelxiu1 2025-07-28 15:30:46 +08:00
parent 17ca385b3f
commit 7671883c96
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberRegionServiceImpl.java
View File

@ -25,6 +25,9 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; 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.Date;
import java.util.List; import java.util.List;
@ -55,20 +58,22 @@ public class CuMemberRegionServiceImpl extends ServiceImpl<CuMemberRegionMapper,
} }
if (null != param.getPkId()) { 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() 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::getPkMember, param.getPkMember())
.eq(CuMemberRegion::getPkId, param.getPkId())
// .eq(CuMemberRegion::getEffective, EYesNo.YES.getIntValue()) // .eq(CuMemberRegion::getEffective, EYesNo.YES.getIntValue())
// .eq(CuMemberRegion::getSystemType, param.getSystemType()) // .eq(CuMemberRegion::getSystemType, param.getSystemType())
// .set(CuMemberRegion::getEffective, EYesNo.NO.getIntValue()) .set(CuMemberRegion::getEffective, EYesNo.NO.getIntValue())
.set(CuMemberRegion::getPkModified, param.getPkMember()) .set(CuMemberRegion::getPkModified, param.getPkMember())
.set(CuMemberRegion::getModifiedTime, new Date()) .set(CuMemberRegion::getModifiedTime, new Date())
.set(CuMemberRegion::getProvince, param.getProvince()) .set(CuMemberRegion::getEffectiveEndDate, result)
.set(CuMemberRegion::getCity, param.getCity())
.set(CuMemberRegion::getCounty, param.getCounty())
); );
return null;
} }
// 新増数据 // 新増数据
CuMemberRegion retailRegion = CuMemberRegion.builder() CuMemberRegion retailRegion = CuMemberRegion.builder()

1
bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml
View File

@ -3176,6 +3176,7 @@
LEFT JOIN BD_AREA PC ON PC.PK_ID = cmrr.COUNTY AND PC.DEL_FLAG = 0 LEFT JOIN BD_AREA PC ON PC.PK_ID = cmrr.COUNTY AND PC.DEL_FLAG = 0
where cmrr.del_flag = 0 where cmrr.del_flag = 0
AND cmrr.PK_MEMBER IN ( #{userId} ) AND cmrr.PK_MEMBER IN ( #{userId} )
and cmrr.EFFECTIVE = 0
<if test="type != null and type == 1"> <if test="type != null and type == 1">
and cmrr.PROVINCE != 0 and cmrr.PROVINCE != 0
and cmrr.CITY = 0 and cmrr.CITY = 0

1
bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberRegionMapper.xml
View File

@ -26,6 +26,7 @@
and bax.del_flag = 0 and bax.del_flag = 0
where cm.del_flag = 0 where cm.del_flag = 0
and cm.pk_id = #{pkMember} and cm.pk_id = #{pkMember}
and cmrr.EFFECTIVE = 0
<if test="type != null and type == 1"> <if test="type != null and type == 1">
and cmrr.PROVINCE != 0 and cmrr.PROVINCE != 0
and cmrr.CITY = 0 and cmrr.CITY = 0