From 82b56d2a7f62baa74e54cbf7ac9dc2f6e82e78b7 Mon Sep 17 00:00:00 2001 From: sangelxiu1 <15781802@163.com> Date: Mon, 25 Aug 2025 13:46:22 +0800 Subject: [PATCH] =?UTF-8?q?##=20Opt=20-=20=E6=89=8B=E6=9C=BA=E5=8F=B7?= =?UTF-8?q?=E5=94=AF=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/hzs/member/base/service/ICuMemberService.java | 1 + .../member/base/service/impl/CuMemberServiceImpl.java | 3 ++- .../controller/manage/CuHandleBusinessController.java | 10 ++++++++++ .../service/impl/CuHandleBusinessServiceImpl.java | 10 ++++++++++ .../controller/api/ApiDomicileChangeController.java | 5 +++++ .../common/core/constant/msg/ConfigMsgConstants.java | 5 ++++- 6 files changed, 32 insertions(+), 2 deletions(-) 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 f990bd61..f2ff3ffd 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 @@ -815,6 +815,7 @@ public interface ICuMemberService extends IService { * @return */ String checkRegisterRelation(String phone, Long pkParent); + String checkRegisterRelation(String phone, Integer systemType); /** * 添加等级升级记录 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 dc2388ee..afc4cf79 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 @@ -3130,7 +3130,8 @@ public class CuMemberServiceImpl extends ServiceImpl i * @param systemType 系统类型 * @return */ - private String checkRegisterRelation(String phone, Integer systemType) { + @Override + public String checkRegisterRelation(String phone, Integer systemType) { if (this.count(Wrappers.lambdaQuery() .eq(CuMember::getPhone, phone) .eq(CuMember::getCategory, ECategory.NORMAL.getValue()) diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/handlebusiness/controller/manage/CuHandleBusinessController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/handlebusiness/controller/manage/CuHandleBusinessController.java index 90403cd4..d49aec32 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/handlebusiness/controller/manage/CuHandleBusinessController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/handlebusiness/controller/manage/CuHandleBusinessController.java @@ -350,6 +350,16 @@ public class CuHandleBusinessController extends BaseController { btvo.setTable5(EYesNo.YES.getIntValue()); btvo.setTable6(EYesNo.YES.getIntValue()); btvo.setTable7(EYesNo.YES.getIntValue()); + Set seenPhones = new HashSet<>(); + for (BusinessMemberVO member : businessSingleVO.getBusinessMemberList()) { + String phone = member.getNewPhone(); + if (!seenPhones.add(phone)) { + BusinessErrorVO bev = new BusinessErrorVO(); + bev.setErrorMsg(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_RETAIL_PHONE_REPEAT) + "["+phone+"]"); + bev.setMemberCode(member.getMemberCode()); + errorMemberList.add(bev); + } + } } } businessSingleVO.setBtvo(btvo); diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/handlebusiness/service/impl/CuHandleBusinessServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/handlebusiness/service/impl/CuHandleBusinessServiceImpl.java index db949508..10e70c8a 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/handlebusiness/service/impl/CuHandleBusinessServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/handlebusiness/service/impl/CuHandleBusinessServiceImpl.java @@ -633,6 +633,16 @@ public class CuHandleBusinessServiceImpl extends ServiceImpl seenPhones = new HashSet<>(); + for (BusinessMemberVO member : handleBusinessVO.getBusinessMemberList()) { + if(businessType.equals(EApprovalBusiness.CHANGE_PHONE.getValue()) + && member.getBusinessType().equals(EApprovalBusiness.CHANGE_PHONE.getValue())){ + String phone = member.getNewValue(); + if (!seenPhones.add(phone)) { + return false; + } + } + } businessMemberListUpdate = getBusinessMemberByBusinessType(businessMemberList, businessType); result = cuMemberService.batchUpdateMemberNameAndMobileByPkmember(businessMemberListUpdate, businessType, loginUser.getUserId()); //重置银行卡 diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/self/controller/api/ApiDomicileChangeController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/self/controller/api/ApiDomicileChangeController.java index 3bb9673c..e5026574 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/self/controller/api/ApiDomicileChangeController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/self/controller/api/ApiDomicileChangeController.java @@ -1,5 +1,6 @@ package com.hzs.member.self.controller.api; +import cn.hutool.core.util.StrUtil; import com.hzs.common.core.annotation.RepeatSubmitSimple; import com.hzs.common.core.constant.MagicNumberConstants; import com.hzs.common.core.constant.msg.ConfigMsgConstants; @@ -121,6 +122,10 @@ public class ApiDomicileChangeController extends BaseController { } domicileChangeVO.setPkCountry(pkCountry); domicileChangeVO.setPkMember(pkMember); + String verifyDuplicationStr = iCuMemberService.checkRegisterRelation(domicileChangeVO.getChangePhone(), SecurityUtils.getSystemType()); + if(StrUtil.isNotEmpty(verifyDuplicationStr)){ + return AjaxResult.error(verifyDuplicationStr); + } // 校验短信验证码 String message = iApiAliSmsService.checkCode(domicileChangeVO.getChangePhone(), domicileChangeVO.getVerificationCode(), null, pkMember); if (null != message) { diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/ConfigMsgConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/ConfigMsgConstants.java index 5193ff2f..97933a56 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/ConfigMsgConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/ConfigMsgConstants.java @@ -1211,5 +1211,8 @@ public class ConfigMsgConstants { */ public static final String MEMBER_RETAIL_REGION_REPEAT = "会员已添加收益区域"; - + /** + * 会员手机号重复 -- 会员手机号重复 + */ + public static final String MEMBER_RETAIL_PHONE_REPEAT = "会员手机号重复"; }