From 15c8b52280c38f071f87e240ef0850208d5cca99 Mon Sep 17 00:00:00 2001
From: "xiaodong.hu" <1075471126@qq.com>
Date: Wed, 26 Jul 2023 21:04:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9ec=E5=8F=98=E6=9B=B4=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/HyPartnerUserInfoMapper.xml        | 45 +++++++++++++++++--
 .../cool/store/entity/SyncEcCustomerDO.java   |  2 +
 2 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml
index af15d5f42..6e6b4459c 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml
@@ -54,14 +54,51 @@
     </where>
   </select>
     <select id="selectByHourDate" resultType="com.cool.store.entity.SyncEcCustomerDO" >
-      SELECT a.id as id, a.username as customername,a.mobile as customermobile,d.`name` as followname,d.mobile  as followmobile ,c.channel_id as channelId FROM  hy_partner_user_info   a  LEFT  join  hy_partner_line_info b  on
-        a.partner_id=b.partner_id     LEFT join   hy_partner_user_channel c   on a.user_channel_id=c.channel_id  left join    enterprise_user d  on b.investment_manager=d.user_id
+      SELECT
+        a.id AS id,b.partner_id,
+        a.username AS customername,
+        a.mobile AS customermobile,
+        d.`name` AS followname,
+        d.mobile AS followmobile,
+        c.channel_id AS channelId ,ifnull(tl_l.followCount,0)  as followCount
+      FROM
+        hy_partner_user_info a
+          LEFT JOIN hy_partner_line_info b ON a.partner_id = b.partner_id   and b.deleted=0
+          LEFT JOIN hy_partner_user_channel c ON a.user_channel_id = c.channel_id
+          LEFT JOIN enterprise_user d ON b.investment_manager = d.user_id and d.deleted=0
+          LEFT JOIN	(
+          SELECT
+            partner_id,
+            IFNULL( COUNT( 1 ), 0 ) AS followCount
+          FROM
+            hy_partner_line_info
+          WHERE
+            ( deleted = 1 OR ( deleted = 0 AND line_status IN ( 0, 3 ) AND close_time IS NOT NULL ) )
+            AND investment_manager IS NOT NULL
+          GROUP BY
+            partner_id )  tl_l  on  b.partner_id=tl_l.partner_id
       WHERE ( a.create_time BETWEEN #{selectTime}  and   #{now}  or
         a.update_time BETWEEN #{selectTime}  and   #{now}  )  order by  a.id  Limit  #{limit1},#{limit2}
     </select>
   <select id="selectByHourDateCount" resultType="java.lang.Integer">
-    SELECT  count(*) FROM  hy_partner_user_info   a  LEFT  join  hy_partner_line_info b  on
-      a.partner_id=b.partner_id     LEFT join   hy_partner_user_channel c   on a.user_channel_id=c.channel_id  left join    enterprise_user d  on b.investment_manager=d.user_id
+    SELECT
+      count(*)
+    FROM
+      hy_partner_user_info a
+        LEFT JOIN hy_partner_line_info b ON a.partner_id = b.partner_id   and b.deleted=0
+        LEFT JOIN hy_partner_user_channel c ON a.user_channel_id = c.channel_id
+        LEFT JOIN enterprise_user d ON b.investment_manager = d.user_id and d.deleted=0
+        LEFT JOIN	(
+        SELECT
+          partner_id,
+          IFNULL( COUNT( 1 ), 0 ) AS followCount
+        FROM
+          hy_partner_line_info
+        WHERE
+          ( deleted = 1 OR ( deleted = 0 AND line_status IN ( 0, 3 ) AND close_time IS NOT NULL ) )
+          AND investment_manager IS NOT NULL
+        GROUP BY
+          partner_id )  tl_l  on  b.partner_id=tl_l.partner_id
     WHERE (a.create_time BETWEEN #{selectTime}  and   #{now}  or
       a.update_time BETWEEN #{selectTime}  and   #{now} )
   </select>
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/SyncEcCustomerDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/SyncEcCustomerDO.java
index 4dcc9a7fe..2479ef6d0 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/entity/SyncEcCustomerDO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/SyncEcCustomerDO.java
@@ -18,4 +18,6 @@ public class SyncEcCustomerDO {
     private String followmobile;
 
     private Integer channelId;
+
+    private Integer followCount;
 }