From fb86e51ac9a286aa498c8c6dee67e1a577b233f7 Mon Sep 17 00:00:00 2001
From: kevin jiang <kevin.jiang@kiisoo.com>
Date: Mon, 11 May 2020 02:38:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A1=B5=20?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=A5=BD=E5=8F=8B=E6=80=BB=E6=95=B0=E4=B8=8E?=
 =?UTF-8?q?=E5=A5=BD=E5=8F=8B=E5=88=97=E8=A1=A8=E7=9A=84=E6=80=BB=E6=95=B0?=
 =?UTF-8?q?=E5=AF=B9=E4=B8=8D=E4=B8=8A=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/StorePromotionDataDOMapper.xml        | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/main/resources/mapper/StorePromotionDataDOMapper.xml b/src/main/resources/mapper/StorePromotionDataDOMapper.xml
index f999bd9..bb8fb8c 100644
--- a/src/main/resources/mapper/StorePromotionDataDOMapper.xml
+++ b/src/main/resources/mapper/StorePromotionDataDOMapper.xml
@@ -290,13 +290,14 @@
     </select>
 
     <select id="selectWxSumCusNumByConditionShopManager" resultType="java.lang.Integer">
-        SELECT count(customer_id) from op_seller_customer_relation
-        WHERE store_id = #{storeId}
+        SELECT count(customer_id) from op_seller_customer_relation t, op_customer t2
+        WHERE t.store_id = #{storeId}
+        and t.customer_id = t2.id
         <if test="startDate != null">
-            and DATE_FORMAT(create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{startDate},'%Y-%m-%d')
+            and DATE_FORMAT(t2.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{startDate},'%Y-%m-%d')
         </if>
         <if test="endDate != null">
-            and DATE_FORMAT(create_time,'%Y-%m-%d') &lt;= DATE_FORMAT(#{endDate},'%Y-%m-%d')
+            and DATE_FORMAT(t2.create_time,'%Y-%m-%d') &lt;= DATE_FORMAT(#{endDate},'%Y-%m-%d')
         </if>
         group by store_id
     </select>
@@ -366,12 +367,13 @@
         t1.id AS storeId
         FROM
         poi_store t1
-        LEFT JOIN `op_seller_customer_relation` t2 ON t1.id = t2.store_id
+         JOIN `op_seller_customer_relation` t2 ON t1.id = t2.store_id
+        JOIN op_customer t3 on t2.customer_id = t3.id
         <if test="startDate != null">
-            and DATE_FORMAT(t2.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{startDate},'%Y-%m-%d')
+            and DATE_FORMAT(t3.create_time,'%Y-%m-%d') &gt;= DATE_FORMAT(#{startDate},'%Y-%m-%d')
         </if>
         <if test="endDate != null">
-            and DATE_FORMAT(t2.create_time,'%Y-%m-%d') &lt;= DATE_FORMAT(#{endDate},'%Y-%m-%d')
+            and DATE_FORMAT(t3.create_time,'%Y-%m-%d') &lt;= DATE_FORMAT(#{endDate},'%Y-%m-%d')
         </if>
         WHERE
         t1.STATUS = 1