From 073df7b0eef86c206cd8298a3bbc198d84aad322 Mon Sep 17 00:00:00 2001
From: dulingling <dll19920503@qq.com>
Date: Mon, 3 Feb 2020 11:52:06 +0800
Subject: [PATCH] =?UTF-8?q?Upd:=E5=AE=A2=E6=88=B7=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E4=BA=A4=E6=98=93=E6=95=B0=E6=8D=AE=E4=BF=AE=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E6=97=A0=E4=BA=A4=E6=98=93=E4=B9=9F=E6=98=BE=E7=A4=BA=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |  2 +-
 .../CustomerAndOrdersStatisticsMapper.xml     | 72 +++++++++++--------
 2 files changed, 45 insertions(+), 29 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5ff40f4a7..e86ade078 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>1.3.21</version>
+    <version>1.3.22</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>1.4.0</jib-maven-plugin.version>
diff --git a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/CustomerAndOrdersStatisticsMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/CustomerAndOrdersStatisticsMapper.xml
index b223cc6f8..1c8eadd2e 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/CustomerAndOrdersStatisticsMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/CustomerAndOrdersStatisticsMapper.xml
@@ -93,36 +93,52 @@
 
     <select id="getSumCustomersAnalysis" resultType="com.alibaba.fastjson.JSONObject">
         <![CDATA[
-        SELECT sum(s.customers) customers,sum(s.orders) orders,sum(s.new_customers) new_customers,
-        sum(s.old_customers) old_customers,sum(s.total) total, sum(s.total)/sum(s.customers) single_amount,
-        date_format(s.date,'%d/%m/%Y') trade_date
-        FROM statistics_customer_order s
-        LEFT JOIN sys_clients c ON  c.client_id = s.client_id and c.is_valid=1
-        ]]>
+        select date_format(calendar.datelist,'%d/%m/%Y') AS trade_date,
+			IFNULL(customerStatic.customers,0) AS customers,
+			IFNULL(customerStatic.orders,0) AS orders,
+			IFNULL(customerStatic.new_customers,0) AS new_customers,
+			IFNULL(customerStatic.old_customers,0) AS old_customers,
+			IFNULL(customerStatic.total,0) AS total,
+			IFNULL(customerStatic.single_amount,0) AS single_amount
+            FROM calendar
+            LEFT JOIN
+            (SELECT sum(s.customers) customers,sum(s.orders) orders,sum(s.new_customers) new_customers,
+                sum(s.old_customers) old_customers,sum(s.total) total, sum(s.total)/sum(s.customers) single_amount,
+                date_format(s.date,'%Y-%m-%d') trade_date
+                FROM statistics_customer_order s
+                LEFT JOIN sys_clients c ON  c.client_id = s.client_id and c.is_valid=1
+                ]]>
+                <where>
+                    <if test="client_ids!=null">
+                        AND s.client_id IN
+                        <foreach collection="client_ids" open="(" close=")" separator="," item="client_id">
+                            #{client_id}
+                        </foreach>
+                    </if>
+                    <if test="client_ids==null and client_id != null">
+                        and s.client_id=#{client_id}
+                    </if>
+                    <if test="channel!=null">and s.channel = #{channel}</if>
+                    <if test="begin!=null">and s.date &gt;= #{begin}</if>
+                    <if test="end!=null">and s.date &lt; #{end}</if>
+                    <if test="org_id!=null">and c.org_id = #{org_id}</if>
+                    <if test="bd_group!=null">and c.client_id in
+                        (SELECT b.client_id FROM sys_client_bd b
+                        INNER JOIN financial_bd_config c ON c.manager_id=b.bd_id
+                        where b.is_valid=1 and b.start_date&lt;=now() and (b.end_date is null or b.end_date &gt;= now())
+                        AND (c.bd_group=#{bd_group} or c.manager_id=#{bd_group})
+                        <if test="bd_group_bd">and c.manager_id=#{bd_group_bd}</if>
+                        )
+                    </if>
+                </where>
+                GROUP BY s.date
+        ) AS customerStatic
+        ON calendar.datelist = customerStatic.trade_date
         <where>
-            <if test="client_ids!=null">
-                AND s.client_id IN
-                <foreach collection="client_ids" open="(" close=")" separator="," item="client_id">
-                    #{client_id}
-                </foreach>
-            </if>
-            <if test="client_ids==null and client_id != null">
-                and s.client_id=#{client_id}
-            </if>
-            <if test="channel!=null">and s.channel = #{channel}</if>
-            <if test="begin!=null">and s.date &gt;= #{begin}</if>
-            <if test="end!=null">and s.date &lt; #{end}</if>
-            <if test="org_id!=null">and c.org_id = #{org_id}</if>
-            <if test="bd_group!=null">and c.client_id in
-                (SELECT b.client_id FROM sys_client_bd b
-                INNER JOIN financial_bd_config c ON c.manager_id=b.bd_id
-                where b.is_valid=1 and b.start_date&lt;=now() and (b.end_date is null or b.end_date &gt;= now())
-                AND (c.bd_group=#{bd_group} or c.manager_id=#{bd_group})
-                <if test="bd_group_bd">and c.manager_id=#{bd_group_bd}</if>
-                )
-            </if>
+            <if test="begin!=null">and calendar.datelist &gt;= #{begin}</if>
+            <if test="end!=null">and calendar.datelist &lt; #{end}</if>
         </where>
-        GROUP BY s.date ORDER BY date DESC
+        ORDER BY calendar.datelist DESC
     </select>
 
     <select id="getSumChannelAnalysis" resultType="com.alibaba.fastjson.JSONObject">