diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/controller/api/RetailMemberController.java b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/controller/api/RetailMemberController.java index 418a5f08..97316def 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/controller/api/RetailMemberController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/controller/api/RetailMemberController.java @@ -166,10 +166,8 @@ public class RetailMemberController extends BaseController { // 达到条件,但是没有选择区域,需要弹窗选择区域 CuMemberRetailAchieveVO retailAchieve = iCuMemberRetailAchieveService.selectMemberSumAchieve(userId, pkCountry, systemType); - // 2024.12.30 添加需求,存在手动V0升V5,需要判断小市场业绩达到2万以上才可以进行开通 - if (retailAchieve.getSmallAreaPv().multiply(new BigDecimal("10000")).compareTo(SysConstants.SMALL_AREA_PV) < 0 - || retailAchieve.getBigArealPv().multiply(new BigDecimal("10000")).compareTo(SysConstants.SMALL_AREA_PV) < 0 - ) { + // TODO 2025.06.09 新需求,选择区域判断等级达到合伙人,血缘累计业绩达到30万,可以选择 + if (retailAchieve.getSmallAreaPv().add(retailAchieve.getBigArealPv()).compareTo(SysConstants.TOTAL_AREA_PV) < 0) { return AjaxResult.error("还未达到选择收益区域条件"); } } diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/SysConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/SysConstants.java index 397ca9f5..ac23007c 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/SysConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/SysConstants.java @@ -29,13 +29,13 @@ public class SysConstants { public static final String PAY_PASSWORD = "222222"; /** - * 小市场2万业绩(人民币) + * 血缘累计业绩30万 */ - public static final BigDecimal SMALL_AREA_PV = new BigDecimal("20000"); + public static final BigDecimal TOTAL_AREA_PV = new BigDecimal("300000"); /** * 开放使用会员编号(用于支付登录查看数据) */ - public static final List CONTROL_MEMBER_LIST = Arrays.asList("HZS20240001", "HZS20240002"); + public static final List CONTROL_MEMBER_LIST = Arrays.asList("RE20240001", "RE20240002"); }