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

## Opt - 增加可不验证PV条件[http://47.94.148.201:8081/index.php?m=bug&f=view&bugID=336]

This commit is contained in:
sangelxiu1 2025-08-01 10:47:02 +08:00
parent a42122fdd5
commit 533de2c56a
3 changed files with 20 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/api/ApiMemberController.java
View File

@ -855,7 +855,7 @@ public class ApiMemberController extends BaseController {
*/ */
@GetMapping("/get-region") @GetMapping("/get-region")
public AjaxResult getRegion(@RequestParam(name = "validatePV", required = false) Boolean validatePV) { public AjaxResult getRegion(@RequestParam(name = "validatePV", required = false) Boolean validatePV) {
return AjaxResult.success(iCuMemberService.getRegion(validatePV)); return AjaxResult.success(iCuMemberService.getRegion());
} }

2
bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberService.java
View File

@ -1005,7 +1005,7 @@ public interface ICuMemberService extends IService<CuMember> {
*/ */
int countGradeMemberPoint(String memberName, String phone, Integer pkGrade, Integer pkCountry); int countGradeMemberPoint(String memberName, String phone, Integer pkGrade, Integer pkCountry);
CheckRegionVO getRegion(Boolean validatePV); CheckRegionVO getRegion();
List<BdArea> getRegionList(Integer type); List<BdArea> getRegionList(Integer type);
BigDecimal getSmallPV(Long userId); BigDecimal getSmallPV(Long userId);

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

@ -3375,10 +3375,7 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
} }
@Override @Override
public CheckRegionVO getRegion(Boolean validatePV) { public CheckRegionVO getRegion() {
if(ObjectUtil.isEmpty(validatePV)){
validatePV = false;
}
CheckRegionVO checkRegionVO = new CheckRegionVO(); CheckRegionVO checkRegionVO = new CheckRegionVO();
checkRegionVO.setData(new CheckRegionVO.CheckRegionWrapper()); checkRegionVO.setData(new CheckRegionVO.CheckRegionWrapper());
Long userId = SecurityUtils.getUserId(); Long userId = SecurityUtils.getUserId();
@ -3403,54 +3400,24 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
// BdAwards configAwards = iAwardsServiceApi.getAwardsOne(config.getPkAwards().intValue()).getData(); // BdAwards configAwards = iAwardsServiceApi.getAwardsOne(config.getPkAwards().intValue()).getData();
BdAwards configAwards = awardsMap.entrySet().stream().filter( o -> o.getValue().getAwardsValue().equals(config.getAwardsValue())).findFirst().get().getValue(); 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()); 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()){ if(bdAwards.getAwardsValue() >= config.getAwardsValue()){
switch (config.getAreaType()){ switch (config.getAreaType()){
case 1: case 1:
checkRegionVO.setProvince(smallPv.compareTo(configAwards.getSmallAssess()) >= 0);
checkRegionVO.getData().setProvinceData(regionDetail); checkRegionVO.getData().setProvinceData(regionDetail);
break; break;
case 2: case 2:
checkRegionVO.setCity(smallPv.compareTo(configAwards.getSmallAssess()) >= 0);
checkRegionVO.getData().setCityData(regionDetail); checkRegionVO.getData().setCityData(regionDetail);
break; break;
case 3: case 3:
checkRegionVO.setCounty(smallPv.compareTo(configAwards.getSmallAssess()) >= 0);
checkRegionVO.getData().setCountyData(regionDetail); checkRegionVO.getData().setCountyData(regionDetail);
break; break;
default: 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);
// }
}
}
} }
} }
// checkRegionVO.setCounty(true); // checkRegionVO.setCounty(true);
@ -3506,7 +3473,7 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
Integer systemType = SecurityUtils.getSystemType(); Integer systemType = SecurityUtils.getSystemType();
param.setSystemType(systemType); param.setSystemType(systemType);
Integer pkCountry = SecurityUtils.getPkCountry(); Integer pkCountry = SecurityUtils.getPkCountry();
CheckRegionVO checkRegionVO = this.getRegion(true); CheckRegionVO checkRegionVO = this.getRegion();
BdArea province = iAreaServiceApi.getArea(param.getProvince()).getData(); BdArea province = iAreaServiceApi.getArea(param.getProvince()).getData();
CuMemberRegionExt cuMemberRegionExt = iCuMemberRegionService.getRegionByMember(userId, param.getType()); CuMemberRegionExt cuMemberRegionExt = iCuMemberRegionService.getRegionByMember(userId, param.getType());
if (null == province) { if (null == province) {