From d87dabb7d798596ae5b99a2566af39c3d2d43160 Mon Sep 17 00:00:00 2001
From: kevin jiang <kevin.jiang@kiisoo.com>
Date: Mon, 1 Jun 2020 05:02:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=B8=AD=E5=BF=83-=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7=E6=98=8E=E7=BB=86=E6=8E=A5=E5=8F=A3=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/main/resources/mapper/OpCustomerDOMapper.xml b/src/main/resources/mapper/OpCustomerDOMapper.xml
index 9fc8a86..2ed685f 100644
--- a/src/main/resources/mapper/OpCustomerDOMapper.xml
+++ b/src/main/resources/mapper/OpCustomerDOMapper.xml
@@ -12,7 +12,8 @@
         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
+        LEFT JOIN privilage_user t4 ON t4.id = t5.user_id
+        where t1.id > 0
         <choose>
             <when test="shopId != null and shopId.size > 0 ">
                 and t1.store_id in
@@ -25,13 +26,37 @@
             </otherwise>
         </choose>
         <if test="startDate != null">
-            and t2.create_time >=  #{startDate}
+            and t1.create_time >=  #{startDate}
         </if>
         <if test="endDate != null">
-            and t2.create_time <![CDATA[ < ]]> #{endDate}
+            and t1.create_time <![CDATA[ < ]]> #{endDate}
         </if>
-        order by t2.create_time desc,t2.id desc,t1.user_id desc
+        order by t1.create_time desc,t1.customer_id desc,t1.user_id desc
     </select>
+
+    <select id="selectCustomerInfoByShopIds_COUNT" resultType="Long">
+        SELECT  count(t1.id)
+        from op_seller_customer_relation t1
+        where t1.id > 0
+        <choose>
+            <when test="shopId != null and shopId.size > 0 ">
+                and t1.store_id in
+                <foreach collection="shopId" index="index" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </when>
+            <otherwise>
+                and  1 = 0
+            </otherwise>
+        </choose>
+        <if test="startDate != null">
+            and t1.create_time >=  #{startDate}
+        </if>
+        <if test="endDate != null">
+            and t1.create_time <![CDATA[ < ]]> #{endDate}
+        </if>
+    </select>
+
     <select id="selectCustomerInfoBySellerId" resultType="com.kiisoo.ic.customer.bean.OpCustomerDTO">
         SELECT  t2.id,t2.`name`,
         t2.member_id as idCard,t0.name as shopName,t0.code as shopCode,
@@ -40,18 +65,33 @@
         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
+        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
+        LEFT JOIN privilage_user t4 ON t4.id = t5.user_id
+        where  t1.id > 0
+        and t1.user_id = #{sellerId}
+        <if test="startDate != null">
+            and t1.create_time >=  #{startDate}
+        </if>
+        <if test="endDate != null">
+            and t1.create_time <![CDATA[ < ]]> #{endDate}
+        </if>
+        GROUP BY t1.customer_id
+        order by  t1.create_time desc,t2.id desc
+    </select>
+
+    <!-- 获取总数 -->
+    <select id="selectCustomerInfoBySellerId_COUNT" resultType="Long">
+        SELECT  count(DISTINCT t1.customer_id)
+        from op_seller_customer_relation t1
+        where  t1.id > 0
         and t1.user_id = #{sellerId}
         <if test="startDate != null">
-            and t2.create_time >=  #{startDate}
+            and t1.create_time >=  #{startDate}
         </if>
         <if test="endDate != null">
-            and t2.create_time <![CDATA[ < ]]> #{endDate}
+            and t1.create_time <![CDATA[ < ]]> #{endDate}
         </if>
-        GROUP BY t2.id
-        order by  t2.create_time desc,t2.id desc
     </select>
 
     <!--客户list-->