From b356ec487c0ce8c917d99a5805046fcd793e84e8 Mon Sep 17 00:00:00 2001
From: cabbage <281119120@qq.com>
Date: Mon, 25 Aug 2025 14:11:35 +0800
Subject: [PATCH] =?UTF-8?q?##=20=E7=A9=BA=E5=8D=95=E4=BA=A7=E5=93=81?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A4=84=E7=90=86=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/MemberEmptyServiceImpl.java  | 19 +++++++++++++++----
 .../empty/CuMemberEmptyDetailMapper.xml       |  2 +-
 2 files changed, 16 insertions(+), 5 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 16183057..fae90ed8 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
@@ -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;
     }
 
diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/empty/CuMemberEmptyDetailMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/empty/CuMemberEmptyDetailMapper.xml
index 0a76e18f..f092fec7 100644
--- a/bd-business/bd-business-member/src/main/resources/mapper/member/empty/CuMemberEmptyDetailMapper.xml
+++ b/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