diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/api/ApiMemberController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/api/ApiMemberController.java index 5e1b4bcc..532ffe10 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/api/ApiMemberController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/api/ApiMemberController.java @@ -854,7 +854,7 @@ public class ApiMemberController extends BaseController { * @return */ @GetMapping("/get-region") - public AjaxResult getRegion() { + public AjaxResult getRegion(@RequestParam(name = "validatePV", required = false) Boolean validatePV) { return AjaxResult.success(iCuMemberService.getRegion()); } 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 f6ec2e95..9fd18d75 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 @@ -3400,52 +3400,22 @@ public class CuMemberServiceImpl extends ServiceImpl i // BdAwards configAwards = iAwardsServiceApi.getAwardsOne(config.getPkAwards().intValue()).getData(); BdAwards configAwards = awardsMap.entrySet().stream().filter( o -> o.getValue().getAwardsValue().equals(config.getAwardsValue())).findFirst().get().getValue(); // 判断业绩 - if(smallPv.compareTo(configAwards.getSmallAssess()) >= 0){ - CheckRegionDetailVO regionDetail = baseMapper.getSelectRegionDetail(userId, config.getAreaType()); - if(ObjectUtil.isEmpty(regionDetail)){ - 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(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); -// } + CheckRegionDetailVO regionDetail = baseMapper.getSelectRegionDetail(userId, config.getAreaType()); + if(bdAwards.getAwardsValue() >= config.getAwardsValue()){ + switch (config.getAreaType()){ + case 1: + checkRegionVO.setProvince(smallPv.compareTo(configAwards.getSmallAssess()) >= 0); + checkRegionVO.getData().setProvinceData(regionDetail); + break; + case 2: + checkRegionVO.setCity(smallPv.compareTo(configAwards.getSmallAssess()) >= 0); + checkRegionVO.getData().setCityData(regionDetail); + break; + case 3: + checkRegionVO.setCounty(smallPv.compareTo(configAwards.getSmallAssess()) >= 0); + checkRegionVO.getData().setCountyData(regionDetail); + break; + default: break; } } }