From 8692a233fe8c5010a122dcb37a71883818573254 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Wed, 17 Sep 2025 10:04:52 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E4=BC=9A=E5=91=98=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E5=8F=B7=E5=94=AF=E4=B8=80=E4=BC=9A=E5=91=98=E5=A7=93=E5=90=8D?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/api/ApiShareController.java | 19 ++++++++++++------- .../core/constant/msg/MemberMsgConstants.java | 2 +- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/share/controller/api/ApiShareController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/share/controller/api/ApiShareController.java index d75cb67b..8ffa9506 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/share/controller/api/ApiShareController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/share/controller/api/ApiShareController.java @@ -1,6 +1,7 @@ package com.hzs.member.share.controller.api; import cn.hutool.core.codec.Base64Decoder; +import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.hzs.common.core.annotation.RepeatSubmitSimple; import com.hzs.common.core.config.BdConfig; @@ -8,10 +9,7 @@ import com.hzs.common.core.constant.CacheConstants; import com.hzs.common.core.constant.CountryConstants; import com.hzs.common.core.constant.msg.MemberMsgConstants; import com.hzs.common.core.domain.R; -import com.hzs.common.core.enums.ECategory; -import com.hzs.common.core.enums.EDelFlag; -import com.hzs.common.core.enums.EShareType; -import com.hzs.common.core.enums.ESystemConfig; +import com.hzs.common.core.enums.*; import com.hzs.common.core.service.RedisService; import com.hzs.common.core.utils.sign.Base64Util; import com.hzs.common.core.utils.uuid.IdUtils; @@ -19,6 +17,7 @@ import com.hzs.common.core.web.domain.AjaxResult; import com.hzs.common.domain.member.base.CuMember; import com.hzs.common.domain.member.ext.CuMemberExt; import com.hzs.common.security.utils.SecurityUtils; +import com.hzs.common.util.TransactionUtils; import com.hzs.member.base.service.ICuMemberService; import com.hzs.member.base.vo.MemberShare; import com.hzs.member.share.param.ShareRegisterParam; @@ -32,6 +31,7 @@ import org.springframework.web.bind.annotation.*; import javax.validation.Valid; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; @@ -121,16 +121,21 @@ public class ApiShareController { } registerParam.setParentMember(parentMember); - // 手机号注册次数 String value = iSystemConfigServiceApi.getBonusSystemConfig(CountryConstants.CHINA_COUNTRY, ESystemConfig.REGISTER_NUMBER.getKey()).getData(); - int phoneCount = iCuMemberService.count(Wrappers.lambdaQuery() + List memberList = iCuMemberService.list(Wrappers.lambdaQuery() .eq(CuMember::getPhone, registerParam.getPhone()) .eq(CuMember::getDelFlag, EDelFlag.UN_DELETE.getValue()) .eq(CuMember::getCategory, ECategory.NORMAL.getValue()) ); - if (phoneCount >= Integer.parseInt(value)) { + // 手机号注册次数 + if (memberList.size() >= Integer.parseInt(value)) { return AjaxResult.error(MemberMsgConstants.SYSTEM_REGISTER_COUNT); } + // 一个手机号只能有一个姓名 + if (!memberList.stream().allMatch(cuMember -> registerParam.getMemberName().equals(cuMember.getMemberName()))) { + return AjaxResult.error(MemberMsgConstants.PHONE_ALREADY_REGISTER); + } + CuMember newCuMember = iCuMemberService.shareRegisterMember(registerParam); if (null != newCuMember) { diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/MemberMsgConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/MemberMsgConstants.java index 21bfa94e..d48bc6f9 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/MemberMsgConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/MemberMsgConstants.java @@ -37,7 +37,7 @@ public class MemberMsgConstants { /** * 验证手机号是否被用户使用 -- 会员信息已注册，若有异议请及时联系在线客服！ */ - public static final String PHONE_ALREADY_REGISTER = "会员信息已注册，若有异议请及时联系在线客服！"; + public static final String PHONE_ALREADY_REGISTER = "会员信息已注册，若有异议请及时联系客服！"; /** * 验证手机号是否在同一个团队 -- 注册信息已存在,请重新输入注册信息！