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 fba2328c..311ee624 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 @@ -848,6 +848,17 @@ public class ApiMemberController extends BaseController { } + /** + * 获取会员收益区域 + * + * @return + */ + @GetMapping("/get-all-region") + public AjaxResult getAllRegion() { + return AjaxResult.success(iCuMemberService.getAllRegion()); + } + + /** * 获取会员收益区域 * 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 2b395017..de14ce42 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 @@ -1007,6 +1007,7 @@ public interface ICuMemberService extends IService { int countGradeMemberPoint(String memberName, String phone, Integer pkGrade, Integer pkCountry); CheckRegionVO getRegion(); + CheckRegionVO getAllRegion(); 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 86d4f557..c6cf30ea 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 @@ -3462,6 +3462,23 @@ public class CuMemberServiceImpl extends ServiceImpl i return checkRegionVO; } + @Override + public CheckRegionVO getAllRegion() { + Long userId = SecurityUtils.getUserId(); + CheckRegionVO checkRegionVO = new CheckRegionVO(); + checkRegionVO.setData(new CheckRegionVO.CheckRegionWrapper()); + CheckRegionDetailVO regionDetail = baseMapper.getSelectRegionDetail(userId, EAreaType.PROVINCE.getValue()); + checkRegionVO.setProvince(ObjectUtil.isNotEmpty(regionDetail)); + checkRegionVO.getData().setProvinceData(regionDetail); + regionDetail = baseMapper.getSelectRegionDetail(userId, EAreaType.CITY.getValue()); + checkRegionVO.setCity(ObjectUtil.isNotEmpty(regionDetail)); + checkRegionVO.getData().setCityData(regionDetail); + regionDetail = baseMapper.getSelectRegionDetail(userId, EAreaType.COUNTY.getValue()); + checkRegionVO.setCounty(ObjectUtil.isNotEmpty(regionDetail)); + checkRegionVO.getData().setCountyData(regionDetail); + return checkRegionVO; + } + @Override public List getRegionList(Integer type) { return baseMapper.getRegionList(SecurityUtils.getUserId(), type);