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 i } } } + }else{ + LambdaQueryWrapper 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 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; + +}