From a43f571940c29eadeb0ec51c074c195d3743fca3 Mon Sep 17 00:00:00 2001 From: sangelxiu1 <15781802@163.com> Date: Tue, 12 Aug 2025 15:50:59 +0800 Subject: [PATCH] =?UTF-8?q?##=20Feat=20-=20=E6=94=B6=E7=9B=8A=E5=8C=BA?= =?UTF-8?q?=E5=9F=9F&=E9=85=8D=E9=80=81=E4=B8=AD=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/RetailMemberController.java | 74 ++++++++++--------- .../mapper/CuMemberRetailRegionMapper.java | 4 +- .../service/ICuMemberRetailRegionService.java | 1 + .../impl/CuMemberRetailRegionServiceImpl.java | 6 ++ .../member/CuMemberRetailRegionMapper.xml | 32 ++++++++ .../api/ApiRetailOrderController.java | 8 +- 6 files changed, 84 insertions(+), 41 deletions(-) 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 956c7a5e..3c93e553 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 @@ -3,10 +3,12 @@ package com.hzs.retail.member.controller.api; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; +import com.hzs.common.core.enums.EGrade; import com.hzs.common.core.web.controller.BaseController; import com.hzs.common.core.web.domain.AjaxResult; import com.hzs.common.core.web.page.TableDataInfo; import com.hzs.common.domain.member.ext.CuMemberExt; +import com.hzs.common.domain.retail.member.ext.CuMemberRetailRegionExt; import com.hzs.common.security.utils.SecurityUtils; import com.hzs.member.base.service.ICuMemberService; import com.hzs.retail.member.service.ICuMemberRetailRegionService; @@ -58,18 +60,18 @@ public class RetailMemberController extends BaseController { // } -// /** -// * 获取会员收益区域 -// * -// * @return -// */ -// @GetMapping("/get-region") -// public AjaxResult getRegion() { -// Long userId = SecurityUtils.getUserId(); -// Integer systemType = SecurityUtils.getSystemType(); -// Integer pkCountry = SecurityUtils.getPkCountry(); -// -// CuMemberRetailRegionExt cuMemberRetailRegionExt = iCuMemberRetailRegionService.getRegionByMember(userId, EGrade.S_VIP.getValue(), systemType); + /** + * 获取会员收益区域 + * + * @return + */ + @GetMapping("/get-region") + public AjaxResult getRegion() { + Long userId = SecurityUtils.getUserId(); + Integer systemType = SecurityUtils.getSystemType(); + Integer pkCountry = SecurityUtils.getPkCountry(); + List cuMemberRetailRegionExtList = iCuMemberRetailRegionService.getRegionByMemberList(userId, EGrade.S_VIP.getValue(), systemType); + return AjaxResult.success(cuMemberRetailRegionExtList); // log.info("cuMemberRetailRegionExt -> {}", JSONUtil.toJsonStr(cuMemberRetailRegionExt)); // if (null != cuMemberRetailRegionExt) { // // 已自选区域或者已后台指定 @@ -103,34 +105,34 @@ public class RetailMemberController extends BaseController { // .build()); // } // } -// // 达到条件，但是没有选择区域，需要弹窗选择区域 -// // 验证伞下业绩+自己是否累计30W -// -// /* -// 2025年6月11日 取消其他验证 -// // 2025.01.11 调整需求，当前会员必须有效（至少下过一单） -// if (iCuMemberRetailRegionService.getOrderCount(userId, systemType, BoxProductUtil.getBoxProductListBySystemType(systemType)) == 0) { -// return AjaxResult.success(RetailMemberRegionVO.builder() -// .regionStatus(EYesNo.NO.getIntValue()) -// .build()); -// } -// -// // 2025.02.21 需求，2025.03.21 按正式规则执行（V5实单非注水盒数达标 或 月大区30万+小区10万，可选择区域） -// R checkResult = iMemberSettleBonusApi.queryValidateBoxOrAchieve(userId); -// if (checkResult.isSuccess()) { -// if (checkResult.getData().getValidateFlag()) { -// return AjaxResult.success(RetailMemberRegionVO.builder() -// .regionStatus(EYesNo.YES.getIntValue()) -// .build()); -// } -// } -// */ + // 达到条件，但是没有选择区域，需要弹窗选择区域 + // 验证伞下业绩+自己是否累计30W + + /* + 2025年6月11日 取消其他验证 + // 2025.01.11 调整需求，当前会员必须有效（至少下过一单） + if (iCuMemberRetailRegionService.getOrderCount(userId, systemType, BoxProductUtil.getBoxProductListBySystemType(systemType)) == 0) { + return AjaxResult.success(RetailMemberRegionVO.builder() + .regionStatus(EYesNo.NO.getIntValue()) + .build()); + } + + // 2025.02.21 需求，2025.03.21 按正式规则执行（V5实单非注水盒数达标 或 月大区30万+小区10万，可选择区域） + R checkResult = iMemberSettleBonusApi.queryValidateBoxOrAchieve(userId); + if (checkResult.isSuccess()) { + if (checkResult.getData().getValidateFlag()) { + return AjaxResult.success(RetailMemberRegionVO.builder() + .regionStatus(EYesNo.YES.getIntValue()) + .build()); + } + } + */ // } -// // 没达到条件，不需要显示区域 + // 没达到条件，不需要显示区域 // return AjaxResult.success(RetailMemberRegionVO.builder() // .regionStatus(EYesNo.NO.getIntValue()) // .build()); -// } + } // // /** // * 设置会员收益区域 diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/mapper/CuMemberRetailRegionMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/mapper/CuMemberRetailRegionMapper.java index e3de6003..b74ddead 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/mapper/CuMemberRetailRegionMapper.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/mapper/CuMemberRetailRegionMapper.java @@ -25,7 +25,9 @@ public interface CuMemberRetailRegionMapper extends BaseMapper getRegionByMemberList(@Param("pkMember") Long pkMember, + @Param("gradeValue") Integer gradeValue, + @Param("systemType") Integer systemType); /** * 插入收益区域 * diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/ICuMemberRetailRegionService.java b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/ICuMemberRetailRegionService.java index 7ddb19a2..76dfb8cf 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/ICuMemberRetailRegionService.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/ICuMemberRetailRegionService.java @@ -24,6 +24,7 @@ public interface ICuMemberRetailRegionService extends IService getRegionByMemberList(Long pkMember, Integer gradeValue, Integer systemType); /** * 设置会员收益区域 diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/impl/CuMemberRetailRegionServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/impl/CuMemberRetailRegionServiceImpl.java index 2ff7dfd2..ff14e84e 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/impl/CuMemberRetailRegionServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/impl/CuMemberRetailRegionServiceImpl.java @@ -22,6 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.Collections; import java.util.Date; import java.util.List; @@ -40,6 +41,11 @@ public class CuMemberRetailRegionServiceImpl extends ServiceImpl getRegionByMemberList(Long pkMember, Integer gradeValue, Integer systemType) { + return baseMapper.getRegionByMemberList(pkMember, gradeValue, systemType); + } + @Transactional(rollbackFor = Exception.class) @Override public String setRegion(RetailMemberRegionParam param) { diff --git a/bd-business/bd-business-member/src/main/resources/mapper/retail/member/CuMemberRetailRegionMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/retail/member/CuMemberRetailRegionMapper.xml index 4996b727..1716d7ae 100644 --- a/bd-business/bd-business-member/src/main/resources/mapper/retail/member/CuMemberRetailRegionMapper.xml +++ b/bd-business/bd-business-member/src/main/resources/mapper/retail/member/CuMemberRetailRegionMapper.xml @@ -243,6 +243,38 @@ nvl( region.num, 0 ) DESC --> + diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/api/ApiRetailOrderController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/api/ApiRetailOrderController.java index 68479bf3..6807331c 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/api/ApiRetailOrderController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/api/ApiRetailOrderController.java @@ -272,10 +272,10 @@ public class ApiRetailOrderController { } // 校验会员选择区域是否已经被占用 - checkStr = this.checkRegionNum(registerParam); - if (null != checkStr) { - return AjaxResult.error(checkStr); - } +// checkStr = this.checkRegionNum(registerParam); +// if (null != checkStr) { +// return AjaxResult.error(checkStr); +// } // 手机号可以重复，不需要进行是否重复校验 -- 已经跳过，此处可以不需要当前判断 // // 校验注册关系（是否跨团队） -- 2024.12.24 修改为校验手机号必须唯一