From 601656e97b7e6e0b4c60b0d5862e150bebc3fecf Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Mon, 1 Dec 2025 10:49:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/czg/account/entity/BkContactList.java |  5 +++++
 .../account/mapper/BkContactListMapper.java   |  2 +-
 .../impl/BkContactListServiceImpl.java        | 12 +++++++----
 .../resources/mapper/BkContactListMapper.xml  | 20 +++++++++----------
 4 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/BkContactList.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/BkContactList.java
index 4e83deaee..e4e2364c7 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/BkContactList.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/BkContactList.java
@@ -4,6 +4,7 @@ import com.mybatisflex.annotation.Column;
 import com.mybatisflex.annotation.Id;
 import com.mybatisflex.annotation.KeyType;
 import com.mybatisflex.annotation.Table;
+
 import java.io.Serializable;
 import java.time.LocalDateTime;
 
@@ -45,6 +46,10 @@ public class BkContactList implements Serializable {
      * 电话号码
      */
     private String phone;
+    /**
+     * 昵称
+     */
+    private String nickName;
 
     /**
      * 历史订单数
diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/mapper/BkContactListMapper.java b/cash-service/account-service/src/main/java/com/czg/service/account/mapper/BkContactListMapper.java
index 32fed0153..a5264978a 100644
--- a/cash-service/account-service/src/main/java/com/czg/service/account/mapper/BkContactListMapper.java
+++ b/cash-service/account-service/src/main/java/com/czg/service/account/mapper/BkContactListMapper.java
@@ -18,5 +18,5 @@ public interface BkContactListMapper extends BaseMapper<BkContactList> {
      * @param shopId 店铺ID
      * @return 通讯录联系人列表
      */
-    List<BkContactList> getUserList(Long shopId);
+    List<BkContactList> getUserList(Long shopId, Long mainShopId);
 }
diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/BkContactListServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/BkContactListServiceImpl.java
index a2992db98..dc42b26a8 100644
--- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/BkContactListServiceImpl.java
+++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/BkContactListServiceImpl.java
@@ -1,12 +1,13 @@
 package com.czg.service.account.service.impl;
 
-import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
-import com.mybatisflex.core.query.QueryWrapper;
-import com.mybatisflex.spring.service.impl.ServiceImpl;
 import com.czg.account.entity.BkContactList;
 import com.czg.account.service.BkContactListService;
+import com.czg.account.service.ShopInfoService;
 import com.czg.service.account.mapper.BkContactListMapper;
+import com.mybatisflex.core.query.QueryWrapper;
+import com.mybatisflex.spring.service.impl.ServiceImpl;
+import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -21,6 +22,8 @@ import java.util.stream.Collectors;
  */
 @Service
 public class BkContactListServiceImpl extends ServiceImpl<BkContactListMapper, BkContactList> implements BkContactListService {
+    @Resource
+    private ShopInfoService shopInfoService;
 
     @Override
     public List<BkContactList> getUserList(Long shopId, Set<String> phones) {
@@ -35,6 +38,7 @@ public class BkContactListServiceImpl extends ServiceImpl<BkContactListMapper, B
                 })
                 .collect(Collectors.toList());
         mapper.insertBatch(collect, 50);
-        return mapper.getUserList(shopId);
+        Long mainShopId = shopInfoService.getMainIdByShopId(shopId);
+        return mapper.getUserList(shopId, mainShopId);
     }
 }
diff --git a/cash-service/account-service/src/main/resources/mapper/BkContactListMapper.xml b/cash-service/account-service/src/main/resources/mapper/BkContactListMapper.xml
index f42bef410..741cfdf6e 100644
--- a/cash-service/account-service/src/main/resources/mapper/BkContactListMapper.xml
+++ b/cash-service/account-service/src/main/resources/mapper/BkContactListMapper.xml
@@ -5,16 +5,16 @@
 <mapper namespace="com.czg.service.account.mapper.BkContactListMapper">
 
     <select id="getUserList" resultType="com.czg.account.entity.BkContactList">
-        SELECT
-            `order`.call_phone AS phone,
-            count( 1 ) AS orderNum,
-            sum( CASE `order`.`status` WHEN '已取消' THEN 1 ELSE 0 END ) AS cancelNum,
-            MAX(`order`.create_time) AS lastBookingTime
-        FROM
-            `bk_order` `order`
-                INNER JOIN bk_contact_list contact ON `order`.call_phone = contact.phone AND contact.shop_id = #{shopId}
-        WHERE
-            `order`.shop_id = #{shopId}
+        SELECT user.nick_name                                             AS nickName,
+               `order`.call_phone                                         AS phone,
+               count(1)                                                   AS orderNum,
+               sum(CASE `order`.`status` WHEN '已取消' THEN 1 ELSE 0 END) AS cancelNum,
+               MAX(`order`.create_time)                                   AS lastBookingTime
+        FROM `bk_order` `order`
+                 INNER JOIN bk_contact_list contact
+                            ON `order`.call_phone = contact.phone AND contact.shop_id = #{shopId}
+                 LEFT JOIN tb_shop_user user ON `contact`.phone = user.phone and user.main_shop_id = #{mainShopId}
+        WHERE `order`.shop_id = #{shopId}
         GROUP BY `order`.call_phone
     </select>
 </mapper>