diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java index 5d66c18d..483ffd38 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java @@ -3384,7 +3384,9 @@ public class CuMemberServiceImpl extends ServiceImpl i // 计算小区 -> 判断业绩是否达标 // 如果达标至BD_AWARDS_REGION_CONFIG获取可选择的配置 CuMemberExt cuMember = this.getMemberById(userId); - BdAwards bdAwards = iAwardsServiceApi.getAwardsOne(cuMember.getPkAwards()).getData(); + Map awardsMap = iAwardsServiceApi.getAwards().getData(); + BdAwards bdAwards = awardsMap.entrySet().stream().filter( o -> o.getValue().getPkId().equals(cuMember.getPkAwards())).findFirst().get().getValue(); +// BdAwards bdAwards = iAwardsServiceApi.getAwardsOne(cuMember.getPkAwards()).getData(); R> r = iBdAwardsRegionConfigServiceApi.getMatchList(bdAwards.getAwardsValue()); List regionConfigList = null; if(r.isSuccess()){ @@ -3395,26 +3397,54 @@ public class CuMemberServiceImpl extends ServiceImpl i if(CollUtil.isNotEmpty(regionConfigList)){ // 匹配到的区域配置 for (BdAwardsRegionConfig config : regionConfigList) { - bdAwards = iAwardsServiceApi.getAwardsOne(config.getPkAwards().intValue()).getData(); +// BdAwards bdAwards = iAwardsServiceApi.getAwardsOne(config.getPkAwards().intValue()).getData(); // 判断业绩 if(smallPv.compareTo(bdAwards.getSmallAssess()) >= 0){ CheckRegionDetailVO regionDetail = baseMapper.getSelectRegionDetail(userId, config.getAreaType()); if(ObjectUtil.isEmpty(regionDetail)){ - if(config.getAwardsValue() == EAwards.HEADER.getValue()){ - checkRegionVO.setCounty(true); - }else if(config.getAwardsValue() == EAwards.MANAGER.getValue()){ - checkRegionVO.setCity(true); - }else if(config.getAwardsValue() == EAwards.HIGH_MANAGER.getValue()){ - checkRegionVO.setProvince(true); + if(bdAwards.getAwardsValue() >= config.getAwardsValue()){ + switch (config.getAreaType()){ + case 1: + checkRegionVO.setProvince(true); + break; + case 2: + checkRegionVO.setCity(true); + break; + case 3: + checkRegionVO.setCounty(true); + break; + default: break; + } } +// if(config.getAwardsValue() >= EAwards.HEADER.getValue()){ +// checkRegionVO.setCounty(true); +// }else if(config.getAwardsValue() >= EAwards.MANAGER.getValue()){ +// checkRegionVO.setCity(true); +// }else if(config.getAwardsValue() >= EAwards.HIGH_MANAGER.getValue()){ +// checkRegionVO.setProvince(true); +// } }else{ - if(config.getAwardsValue() == EAwards.HEADER.getValue()){ - checkRegionVO.getData().setCountyData(regionDetail); - }else if(config.getAwardsValue() == EAwards.MANAGER.getValue()){ - checkRegionVO.getData().setCityData(regionDetail); - }else if(config.getAwardsValue() == EAwards.HIGH_MANAGER.getValue()){ - checkRegionVO.getData().setProvinceData(regionDetail); + if(bdAwards.getAwardsValue() >= config.getAwardsValue()){ + switch (config.getAreaType()){ + case 1: + checkRegionVO.getData().setProvinceData(regionDetail); + break; + case 2: + checkRegionVO.getData().setCityData(regionDetail); + break; + case 3: + checkRegionVO.getData().setCountyData(regionDetail); + break; + default: break; + } } +// if(config.getAwardsValue() == EAwards.HEADER.getValue()){ +// checkRegionVO.getData().setCountyData(regionDetail); +// }else if(config.getAwardsValue() == EAwards.MANAGER.getValue()){ +// checkRegionVO.getData().setCityData(regionDetail); +// }else if(config.getAwardsValue() == EAwards.HIGH_MANAGER.getValue()){ +// checkRegionVO.getData().setProvinceData(regionDetail); +// } } } }