From fef8a6859fc5b5988193933f5411014251c13af2 Mon Sep 17 00:00:00 2001
From: wangweijia <495720349@qq.com>
Date: Thu, 30 Apr 2020 00:57:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=97=E9=93=BA=E5=AF=B9=E5=BA=94=E7=9A=84?=
 =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E7=94=A8=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/OpCustomerDOMapper.xml    | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/main/resources/mapper/OpCustomerDOMapper.xml b/src/main/resources/mapper/OpCustomerDOMapper.xml
index 9874cbb..44ec27d 100644
--- a/src/main/resources/mapper/OpCustomerDOMapper.xml
+++ b/src/main/resources/mapper/OpCustomerDOMapper.xml
@@ -33,14 +33,16 @@
         order by t1.create_time desc,t2.id desc,t1.user_id desc
     </select>
     <select id="selectCustomerInfoBySellerId" resultType="com.kiisoo.ic.customer.bean.OpCustomerDTO">
-        select
-        t2.id,t2.`name`,t2.member_id as idCard,GROUP_CONCAT(DISTINCT t0.`name`) as shopName, GROUP_CONCAT(DISTINCT t4.`name`) as sellerName, t3.birthday, t2.phone
-        ,t3.name as vipName,t3.phone as vipPhone, t1.create_time
-        from
-        poi_store t0,
-        op_seller_customer_relation t1 LEFT JOIN privilage_user t4 on t1.user_id = t4.id,
-        op_customer t2 LEFT JOIN op_vip t3 on t2.member_id = t3.id
-        where t0.id = t1.store_id and t1.customer_id = t2.id
+        SELECT  t2.id,t2.`name`,
+        t2.member_id as idCard,t0.name as shopName,t0.code as shopCode,
+        t4.name as sellerName, t3.birthday, t2.phone,
+        t3.name as vipName,t3.phone as vipPhone, t5.staff_code as sellerCode, t1.create_time as createTime
+        from op_seller_customer_relation t1
+        left join poi_store t0 on t0.id = t1.store_id
+        left join poi_store_staff t5 ON t5.store_id = t0.id and t1.user_id = t5.id
+        LEFT JOIN op_customer t2 ON t2.id = t1.customer_id
+        LEFT JOIN op_vip t3 ON t3.id = t2.member_id
+        LEFT JOIN privilage_user t4 ON t4.id = t5.user_id where  1 =1
         and t1.user_id = #{sellerId}
         <if test="startDate != null">
             and t1.create_time >=  #{startDate}