## 空单产品数据处理；

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/empty/service/impl/MemberEmptyServiceImpl.java

@@ -96,10 +96,12 @@ public class MemberEmptyServiceImpl implements IMemberEmptyService {
     public void importTemplate(List<MemberEmptyDetailDTO> resultList) {
         // 会员编号列表（导入会员编号去重）
         List<String> checkMemberList = new ArrayList<>();
+        // 会员联系方式列表（需要查库校验）
+        List<String> checkPhoneList = new ArrayList<>();
 
         // 遍历导入数据，提取各种校验所需要的数据
         for (MemberEmptyDetailDTO detail : resultList) {
-            this.checkBase(detail, checkMemberList);
+            this.checkBase(detail, checkMemberList, checkPhoneList);
         }
     }
 
@@ -209,7 +211,7 @@ public class MemberEmptyServiceImpl implements IMemberEmptyService {
 
         // 遍历导入数据，提取各种校验所需要的数据
         for (MemberEmptyDetailDTO detail : resultList) {
-            if (this.checkBase(detail, checkMemberList)) {
+            if (this.checkBase(detail, checkMemberList, checkPhoneList)) {
                 // 已经存在异常，直接返回
                 return false;
             }
@@ -461,7 +463,7 @@ public class MemberEmptyServiceImpl implements IMemberEmptyService {
      * @param detail          校验数据
      * @param checkMemberList 会员编号列表
      */
-    private boolean checkBase(MemberEmptyDetailDTO detail, List<String> checkMemberList) {
+    private boolean checkBase(MemberEmptyDetailDTO detail, List<String> checkMemberList, List<String> checkPhoneList) {
         // 校验之前先为空
         detail.setPointStatus(EPointStatus.NORMAL.getValue());
         detail.setContentAbstract("");
@@ -492,7 +494,16 @@ public class MemberEmptyServiceImpl implements IMemberEmptyService {
             // 导入数据中不重复的会员编号，需要查库校验是否重复
             checkMemberList.add(detail.getMemberCode());
         }
-
+        if (checkPhoneList.contains(detail.getPhone())) {
+            // 导入的数据存在重复联系方式，异常状态
+            detail.setPointStatus(EPointStatus.ABNORMAL.getValue());
+            // 联系方式存在重复
+            detail.setContentAbstract(detail.getContentAbstract() + TransactionUtils.getContent(MemberMsgConstants.EMPTY_PHONE_NOT) + ";");
+            hasError = true;
+        } else {
+            // 导入数据中不重复的联系方式，需要查库校验是否重复
+            checkPhoneList.add(detail.getPhone());
+        }
         return hasError;
     }
 

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-business/bd-business-member/src/main/resources/mapper/member/empty/CuMemberEmptyDetailMapper.xml

@@ -111,7 +111,7 @@
             #{item.recCounty, jdbcType=NUMERIC} rec_county,
             #{item.recAddress, jdbcType=VARCHAR} rec_address,
             #{item.contentAbstract, jdbcType=VARCHAR} content_abstract,
-            #{item.productFlag} product_flag,
+            1 product_flag,
             #{item.orderType} order_type,
             #{item.autoFlag} auto_flag
             from dual

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