From 3b87d98457ef4582f8572b6af623eee4dc08c89a Mon Sep 17 00:00:00 2001
From: woody <woody@163>
Date: Fri, 13 Jun 2025 09:03:12 +0800
Subject: [PATCH] =?UTF-8?q?feat(MemberEmptyService):=20=E7=A9=BA=E5=8D=95?=
 =?UTF-8?q?=E6=B3=A8=E5=86=8C=E4=B8=8D=E6=A0=A1=E9=AA=8C=E6=89=8B=E6=9C=BA?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/MemberEmptyServiceImpl.java  | 33 ++++---------------
 1 file changed, 6 insertions(+), 27 deletions(-)

diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/service/impl/MemberEmptyServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/service/impl/MemberEmptyServiceImpl.java
index dfadf4ff..3eca5bb6 100644
--- a/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/service/impl/MemberEmptyServiceImpl.java
+++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/service/impl/MemberEmptyServiceImpl.java
@@ -116,12 +116,10 @@ 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, checkPhoneList);
+            this.checkBase(detail, checkMemberList);
         }
     }
 
@@ -255,7 +253,7 @@ public class MemberEmptyServiceImpl implements IMemberEmptyService {
 
         // 遍历导入数据，提取各种校验所需要的数据
         for (MemberEmptyDetailDTO detail : resultList) {
-            if (this.checkBase(detail, checkMemberList, checkPhoneList)) {
+            if (this.checkBase(detail, checkMemberList)) {
                 // 已经存在异常，直接返回
                 return false;
             }
@@ -270,8 +268,8 @@ public class MemberEmptyServiceImpl implements IMemberEmptyService {
 
         // 查询会员编号是否存在
         Map<String, Integer> checkCodeMap = iCuMemberService.checkMemberCodeExist(checkMemberList, true, pkMemberEmpty);
-        // 查询联系方式是否存在
-        Map<String, Integer> checkPhoneMap = iCuMemberService.checkMemberPhoneExist(checkPhoneList, true, pkMemberEmpty, systemType);
+//        // 查询联系方式是否存在
+//        Map<String, Integer> checkPhoneMap = iCuMemberService.checkMemberPhoneExist(checkPhoneList, true, pkMemberEmpty, systemType);
 
         // 查询推荐编号是否存在（在本次推荐数据中的直接排除掉）
         final Map<String, Integer> checkParentCodeMap = new HashMap<>();
@@ -290,15 +288,6 @@ public class MemberEmptyServiceImpl implements IMemberEmptyService {
                     bool[0] = false;
                 }
             }
-            if (checkPhoneMap.size() > 0) {
-                if (null != checkPhoneMap.get(detail.getPhone()) && checkPhoneMap.get(detail.getPhone()) >= 1) {
-                    // 导入的会员联系方式已经存在数据库中，异常状态
-                    detail.setPointStatus(EPointStatus.ABNORMAL.getValue());
-                    // 会员联系方式存在重复
-                    detail.setContentAbstract(detail.getContentAbstract().replace(TransactionUtils.getContent(MemberMsgConstants.EMPTY_PHONE_NOT), "") + TransactionUtils.getContent(MemberMsgConstants.EMPTY_PHONE_NOT) + ";");
-                    bool[0] = false;
-                }
-            }
             // 处理校验推荐编号是否存在
             if (!checkMemberList.contains(detail.getParentCode()) && checkParentCodeMap.get(detail.getParentCode()) == null) {
                 // 推荐编号不在本次导入的会员中，也不在数据库中，异常状态
@@ -568,9 +557,8 @@ public class MemberEmptyServiceImpl implements IMemberEmptyService {
      *
      * @param detail          校验数据
      * @param checkMemberList 会员编号列表
-     * @param checkPhoneList  会员联系方式列表
      */
-    private boolean checkBase(MemberEmptyDetailDTO detail, List<String> checkMemberList, List<String> checkPhoneList) {
+    private boolean checkBase(MemberEmptyDetailDTO detail, List<String> checkMemberList) {
         // 校验之前先为空
         detail.setPointStatus(EPointStatus.NORMAL.getValue());
         detail.setContentAbstract("");
@@ -601,16 +589,7 @@ 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;
     }