## Opt - 手机号唯一

bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberService.java

@@ -815,6 +815,7 @@ public interface ICuMemberService extends IService<CuMember> {
      * @return
      */
     String checkRegisterRelation(String phone, Long pkParent);
+    String checkRegisterRelation(String phone, Integer systemType);
 
     /**
      * 添加等级升级记录

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<CuMemberMapper, CuMember> i
      * @param systemType 系统类型
      * @return
      */
-    private String checkRegisterRelation(String phone, Integer systemType) {
+    @Override
+    public String checkRegisterRelation(String phone, Integer systemType) {
         if (this.count(Wrappers.<CuMember>lambdaQuery()
                 .eq(CuMember::getPhone, phone)
                 .eq(CuMember::getCategory, ECategory.NORMAL.getValue())

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<String> 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);

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<CuHandleBusinessMap
             Integer businessType = businessTypeValueVO.getBusinessType();
             //变更姓名、变更联系方式
             if (businessType.equals(EApprovalBusiness.CHANGE_NAME.getValue()) || businessType.equals(EApprovalBusiness.CHANGE_PHONE.getValue())) {
+                Set<String> 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());
                 //重置银行卡

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) {

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 = "会员手机号重复";
 }