diff --git a/bd-api/bd-api-member/src/main/java/com/hzs/member/base/IMemberServiceApi.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/base/IMemberServiceApi.java index 418936eb..c35a1d13 100644 --- a/bd-api/bd-api-member/src/main/java/com/hzs/member/base/IMemberServiceApi.java +++ b/bd-api/bd-api-member/src/main/java/com/hzs/member/base/IMemberServiceApi.java @@ -386,4 +386,13 @@ public interface IMemberServiceApi { */ R> listEffectiveRegion(Date queryDate); + /** + * 校验手机号必须唯一 + * + * @param phone 联系方式 + * @param parentCode 推荐编号 + * @return 返回为null则正常,否则则错误信息 + */ + R checkRegisterRelation(String phone, String parentCode); + } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/provider/MemberServiceProvider.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/provider/MemberServiceProvider.java index 15776092..f0008276 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/provider/MemberServiceProvider.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/provider/MemberServiceProvider.java @@ -376,4 +376,9 @@ public class MemberServiceProvider implements IMemberServiceApi { return R.ok(regionMap); } + @Override + public R checkRegisterRelation(String phone, String parentCode) { + return R.ok(iCuMemberService.checkRegisterRelation(phone, parentCode)); + } + } 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 0775239d..87434cc1 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 @@ -789,8 +789,6 @@ public interface ICuMemberService extends IService { CuMember getRetailTopMember(Long pkMember, String memberCode, Long topPkMember, String topMemberCode); /** - * 校验注册关系(是否跨团队) - * 2024.12.24 修改为校验手机号必须唯一(9035) * 根据推荐人编号,校验手机号必须唯一 * * @param phone 联系方式 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 9070417d..3e5b544d 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 @@ -134,6 +134,7 @@ public class CuMemberServiceImpl extends ServiceImpl i private IMemberServiceApi memberServiceApi; @DubboReference private IGradeServiceApi gradeService; + @Override public Boolean saveMember(CuMember cuMember) { boolean save = false; @@ -1383,7 +1384,7 @@ public class CuMemberServiceImpl extends ServiceImpl i // 新上级 uc.getEditNewPlaceMemberCode() // 旧上级 getMemberById(uc.getPkParent()).getMemberCode() // 关闭直推修改等级逻辑 - if(1 == 2){ + if (1 == 2) { CuMember newMember = memberServiceApi.getMember(uc.getEditNewPlaceMemberCode()).getData(); CuMember oldMember = getMemberById(uc.getPkParent()); CuMember mainMember = getMember(uc.getPkMember()); @@ -1397,7 +1398,7 @@ public class CuMemberServiceImpl extends ServiceImpl i return code; } - public void validateGrade(CuMember mainMember, CuMember oldMember, CuMember newMember){ + public void validateGrade(CuMember mainMember, CuMember oldMember, CuMember newMember) { Integer mainGradeValue = gradeService.getGrade(mainMember.getPkSettleGrade()).getData().getGradeValue(); Integer oldGradeValue = gradeService.getGrade(oldMember.getPkSettleGrade()).getData().getGradeValue(); Integer newGradeValue = gradeService.getGrade(newMember.getPkSettleGrade()).getData().getGradeValue(); @@ -1407,10 +1408,10 @@ public class CuMemberServiceImpl extends ServiceImpl i queryWrapper.isNotNull(CuMemberLevel::getPkOrder); queryWrapper.orderByDesc(CuMemberLevel::getUpgradeTime); CuMemberLevel lastUpgrade = cuMemberLevelServiceImpl.getOne(queryWrapper, false); - if(mainGradeValue.equals(EGrade.VIP.getValue())){ + if (mainGradeValue.equals(EGrade.VIP.getValue())) { // old 直推是否还有EGrade.VIP 没有则掉等级 int subUserCount = baseMapper.getMemberCountWithGradeAndParent(oldMember.getPkId(), EGrade.VIP.getValue()); - if(subUserCount < 1){ + if (subUserCount < 1) { // 掉等级 GradeDTO targetGrade = gradeService.getGradeByGradeValue(EGrade.VIP.getValue(), SecurityUtils.getPkCountry()).getData(); oldMember.setPkSettleGradeValue(targetGrade.getPkId()); @@ -1421,7 +1422,7 @@ public class CuMemberServiceImpl extends ServiceImpl i baseMapper.updateById(oldMember); cuMemberLevelServiceImpl.remove(removeWrapper); } - if(newGradeValue.equals(EGrade.VIP.getValue())){ + if (newGradeValue.equals(EGrade.VIP.getValue())) { // 升等级 GradeDTO targetGrade = gradeService.getGradeByGradeValue(EGrade.S_VIP.getValue(), SecurityUtils.getPkCountry()).getData(); newMember.setPkSettleGradeValue(targetGrade.getPkId()); @@ -1439,10 +1440,10 @@ public class CuMemberServiceImpl extends ServiceImpl i baseMapper.updateById(newMember); } // new 是否为EGrade.VIP 如果是则升等级 - }else if(mainGradeValue.equals(EGrade.REGION.getValue())){ + } else if (mainGradeValue.equals(EGrade.REGION.getValue())) { // old 直推是否还有EGrade.REGION 没有则掉等级 int subUserCount = baseMapper.getMemberCountWithGradeAndParent(oldMember.getPkId(), EGrade.REGION.getValue()); - if(subUserCount < 1){ + if (subUserCount < 1) { // 掉等级 GradeDTO targetGrade = gradeService.getGradeByGradeValue(EGrade.REGION.getValue(), SecurityUtils.getPkCountry()).getData(); oldMember.setPkSettleGradeValue(targetGrade.getPkId()); @@ -1453,7 +1454,7 @@ public class CuMemberServiceImpl extends ServiceImpl i baseMapper.updateById(oldMember); cuMemberLevelServiceImpl.remove(removeWrapper); } - if(newGradeValue.equals(EGrade.REGION.getValue())){ + if (newGradeValue.equals(EGrade.REGION.getValue())) { // 升等级 GradeDTO targetGrade = gradeService.getGradeByGradeValue(EGrade.DIRECTOR.getValue(), SecurityUtils.getPkCountry()).getData(); newMember.setPkSettleGradeValue(targetGrade.getPkId()); @@ -3122,17 +3123,15 @@ public class CuMemberServiceImpl extends ServiceImpl i * @return */ private String checkRegisterRelation(String phone, Integer systemType) { - // new 手机号可以重复,不需要进行是否重复校验 - return null; -// if (this.count(Wrappers.lambdaQuery() -// .eq(CuMember::getPhone, phone) -// .eq(CuMember::getCategory, ECategory.NORMAL.getValue()) -// .eq(CuMember::getSystemType, systemType) -// ) == 0) { -// // 手机号不存在,可以进行注册 -// return null; -// } -// return "注册信息已存在,请重新输入注册信息"; + if (this.count(Wrappers.lambdaQuery() + .eq(CuMember::getPhone, phone) + .eq(CuMember::getCategory, ECategory.NORMAL.getValue()) + .eq(null != systemType, CuMember::getSystemType, systemType) + ) == 0) { + // 手机号不存在,可以进行注册 + return null; + } + return "当前联系方式已经存在"; } @Override 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 3bf343e7..5e142f6f 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 @@ -148,11 +148,10 @@ public class ApiRetailOrderController { */ @PostMapping("/valid-relation") public AjaxResult validRelation(@Valid @RequestBody RetailOrderRelationParam relationParam) { - // new 手机号可以重复,不需要进行是否重复校验 -- 已经跳过,此处可以不需要当前判断 -// String relationStr = iMemberServiceApi.checkRegisterRelation(relationParam.getPhone(), relationParam.getParentCode()).getData(); -// if (relationStr != null) { -// return AjaxResult.error(relationStr); -// } + String relationStr = iMemberServiceApi.checkRegisterRelation(relationParam.getPhone(), relationParam.getParentCode()).getData(); + if (relationStr != null) { + return AjaxResult.error(relationStr); + } return AjaxResult.success(); } @@ -232,12 +231,11 @@ public class ApiRetailOrderController { // return AjaxResult.error(checkStr); // } - // 手机号可以重复,不需要进行是否重复校验 -- 已经跳过,此处可以不需要当前判断 -// // 校验注册关系(是否跨团队) -- 2024.12.24 修改为校验手机号必须唯一 -// String relationStr = iMemberServiceApi.checkRegisterRelation(registerParam.getPhone(), registerParam.getParentCode()).getData(); -// if (relationStr != null) { -// return AjaxResult.error(relationStr); -// } + // 校验手机号必须唯一 + String relationStr = iMemberServiceApi.checkRegisterRelation(registerParam.getPhone(), registerParam.getParentCode()).getData(); + if (relationStr != null) { + return AjaxResult.error(relationStr); + } // 购物车中获取商品信息 registerParam.setOrderItemsParams(convertShoppingCarToSku(registerParam.getPkCreator(), registerParam.getShopList())); @@ -282,12 +280,11 @@ public class ApiRetailOrderController { // return AjaxResult.error(checkStr); // } - // 手机号可以重复,不需要进行是否重复校验 -- 已经跳过,此处可以不需要当前判断 -// // 校验注册关系(是否跨团队) -- 2024.12.24 修改为校验手机号必须唯一 -// String relationStr = iMemberServiceApi.checkRegisterRelation(registerParam.getPhone(), registerParam.getParentCode()).getData(); -// if (relationStr != null) { -// return AjaxResult.error(relationStr); -// } + // 校验手机号必须唯一 + String relationStr = iMemberServiceApi.checkRegisterRelation(registerParam.getPhone(), registerParam.getParentCode()).getData(); + if (relationStr != null) { + return AjaxResult.error(relationStr); + } // 支付入参 registerParam.setIsPay(EYesNo.YES.getIntValue()); diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/param/RetailOrderRelationParam.java b/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/param/RetailOrderRelationParam.java index 2279944e..6d54ce5e 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/param/RetailOrderRelationParam.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/param/RetailOrderRelationParam.java @@ -3,15 +3,10 @@ package com.hzs.retail.sale.param; import lombok.Data; import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; import java.io.Serializable; /** - * @Description: 新零售关系校验入参 - * @Author: jiang chao - * @Time: 2024/12/19 11:52 - * @Classname: RetailOrderRelationParam - * @PackageName: com.hzs.retail.sale.param + * 新零售关系校验入参 */ @Data public class RetailOrderRelationParam implements Serializable {