From 36eece644640035a686f1a2b8a5d4b25071ef127 Mon Sep 17 00:00:00 2001 From: sangelxiu1 <15781802@163.com> Date: Fri, 1 Aug 2025 09:50:28 +0800 Subject: [PATCH 1/2] =?UTF-8?q?##=20Opt=20-=20=E5=A2=9E=E5=8A=A0=E5=8F=AF?= =?UTF-8?q?=E4=B8=8D=E9=AA=8C=E8=AF=81PV=E6=9D=A1=E4=BB=B6[http://47.94.14?= =?UTF-8?q?8.201:8081/index.php=3Fm=3Dbug&f=3Dview&bugID=3D336]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../member/base/controller/api/ApiMemberController.java | 4 ++-- .../com/hzs/member/base/service/ICuMemberService.java | 2 +- .../member/base/service/impl/CuMemberServiceImpl.java | 9 ++++++--- 3 files changed, 9 insertions(+), 6 deletions(-) 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..f8979c67 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,8 +854,8 @@ public class ApiMemberController extends BaseController { * @return */ @GetMapping("/get-region") - public AjaxResult getRegion() { - return AjaxResult.success(iCuMemberService.getRegion()); + public AjaxResult getRegion(@RequestParam(name = "validatePV", required = false) Boolean validatePV) { + return AjaxResult.success(iCuMemberService.getRegion(validatePV)); } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberService.java index daf0e855..cb264ca1 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberService.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberService.java @@ -1005,7 +1005,7 @@ public interface ICuMemberService extends IService { */ int countGradeMemberPoint(String memberName, String phone, Integer pkGrade, Integer pkCountry); - CheckRegionVO getRegion(); + CheckRegionVO getRegion(Boolean validatePV); List getRegionList(Integer type); BigDecimal getSmallPV(Long userId); 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..96fd3944 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 @@ -3375,7 +3375,10 @@ public class CuMemberServiceImpl extends ServiceImpl i } @Override - public CheckRegionVO getRegion() { + public CheckRegionVO getRegion(Boolean validatePV) { + if(ObjectUtil.isEmpty(validatePV)){ + validatePV = false; + } CheckRegionVO checkRegionVO = new CheckRegionVO(); checkRegionVO.setData(new CheckRegionVO.CheckRegionWrapper()); Long userId = SecurityUtils.getUserId(); @@ -3400,7 +3403,7 @@ 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){ + if(smallPv.compareTo(configAwards.getSmallAssess()) >= 0 || !validatePV){ CheckRegionDetailVO regionDetail = baseMapper.getSelectRegionDetail(userId, config.getAreaType()); if(ObjectUtil.isEmpty(regionDetail)){ if(bdAwards.getAwardsValue() >= config.getAwardsValue()){ @@ -3503,7 +3506,7 @@ public class CuMemberServiceImpl extends ServiceImpl i Integer systemType = SecurityUtils.getSystemType(); param.setSystemType(systemType); Integer pkCountry = SecurityUtils.getPkCountry(); - CheckRegionVO checkRegionVO = this.getRegion(); + CheckRegionVO checkRegionVO = this.getRegion(true); BdArea province = iAreaServiceApi.getArea(param.getProvince()).getData(); CuMemberRegionExt cuMemberRegionExt = iCuMemberRegionService.getRegionByMember(userId, param.getType()); if (null == province) { From 0c799715d7085529d5a25a0d48de63674d0331c7 Mon Sep 17 00:00:00 2001 From: sangelxiu1 <15781802@163.com> Date: Fri, 1 Aug 2025 10:47:02 +0800 Subject: [PATCH 2/2] =?UTF-8?q?##=20Opt=20-=20=E5=A2=9E=E5=8A=A0=E5=8F=AF?= =?UTF-8?q?=E4=B8=8D=E9=AA=8C=E8=AF=81PV=E6=9D=A1=E4=BB=B6[http://47.94.14?= =?UTF-8?q?8.201:8081/index.php=3Fm=3Dbug&f=3Dview&bugID=3D336]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/api/ApiMemberController.java | 2 +- .../member/base/service/ICuMemberService.java | 2 +- .../service/impl/CuMemberServiceImpl.java | 69 +++++-------------- 3 files changed, 20 insertions(+), 53 deletions(-) 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 f8979c67..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 @@ -855,7 +855,7 @@ public class ApiMemberController extends BaseController { */ @GetMapping("/get-region") public AjaxResult getRegion(@RequestParam(name = "validatePV", required = false) Boolean validatePV) { - return AjaxResult.success(iCuMemberService.getRegion(validatePV)); + return AjaxResult.success(iCuMemberService.getRegion()); } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberService.java index cb264ca1..daf0e855 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberService.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberService.java @@ -1005,7 +1005,7 @@ public interface ICuMemberService extends IService { */ int countGradeMemberPoint(String memberName, String phone, Integer pkGrade, Integer pkCountry); - CheckRegionVO getRegion(Boolean validatePV); + CheckRegionVO getRegion(); List getRegionList(Integer type); BigDecimal getSmallPV(Long userId); 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 96fd3944..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 @@ -3375,10 +3375,7 @@ public class CuMemberServiceImpl extends ServiceImpl i } @Override - public CheckRegionVO getRegion(Boolean validatePV) { - if(ObjectUtil.isEmpty(validatePV)){ - validatePV = false; - } + public CheckRegionVO getRegion() { CheckRegionVO checkRegionVO = new CheckRegionVO(); checkRegionVO.setData(new CheckRegionVO.CheckRegionWrapper()); Long userId = SecurityUtils.getUserId(); @@ -3403,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 || !validatePV){ - 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; } } } @@ -3506,7 +3473,7 @@ public class CuMemberServiceImpl extends ServiceImpl i Integer systemType = SecurityUtils.getSystemType(); param.setSystemType(systemType); Integer pkCountry = SecurityUtils.getPkCountry(); - CheckRegionVO checkRegionVO = this.getRegion(true); + CheckRegionVO checkRegionVO = this.getRegion(); BdArea province = iAreaServiceApi.getArea(param.getProvince()).getData(); CuMemberRegionExt cuMemberRegionExt = iCuMemberRegionService.getRegionByMember(userId, param.getType()); if (null == province) {