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

Merge remote-tracking branch 'origin/bd_dev' into bd_dev

This commit is contained in:
cabbage 2025-08-01 14:06:16 +08:00
parent c9fbd00fd6 0c799715d7
commit 9c1a6995b7
2 changed files with 17 additions and 47 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

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

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

@ -3400,52 +3400,22 @@ 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){ CheckRegionDetailVO regionDetail = baseMapper.getSelectRegionDetail(userId, config.getAreaType());
CheckRegionDetailVO regionDetail = baseMapper.getSelectRegionDetail(userId, config.getAreaType()); if(bdAwards.getAwardsValue() >= config.getAwardsValue()){
if(ObjectUtil.isEmpty(regionDetail)){ switch (config.getAreaType()){
if(bdAwards.getAwardsValue() >= config.getAwardsValue()){ case 1:
switch (config.getAreaType()){ checkRegionVO.setProvince(smallPv.compareTo(configAwards.getSmallAssess()) >= 0);
case 1: checkRegionVO.getData().setProvinceData(regionDetail);
checkRegionVO.setProvince(true); break;
break; case 2:
case 2: checkRegionVO.setCity(smallPv.compareTo(configAwards.getSmallAssess()) >= 0);
checkRegionVO.setCity(true); checkRegionVO.getData().setCityData(regionDetail);
break; break;
case 3: case 3:
checkRegionVO.setCounty(true); checkRegionVO.setCounty(smallPv.compareTo(configAwards.getSmallAssess()) >= 0);
break; checkRegionVO.getData().setCountyData(regionDetail);
default: break; 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);
// }
} }
} }
} }