From dc02604db2c2552d6da420a6a98972068fb33a50 Mon Sep 17 00:00:00 2001
From: yixian <astro.dai@royalpay.com.au>
Date: Wed, 8 May 2019 14:34:07 +0800
Subject: [PATCH] =?UTF-8?q?sql=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mappers/TransactionAnalysisMapper.xml     | 46 +++++++++----------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml
index a4c461eeb..32ef0c8cf 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml
@@ -377,11 +377,10 @@
 
     <select id="countNewCustomers" resultType="java.lang.Integer">
         <![CDATA[
-        SELECT COUNT(DISTINCT customer_id) FROM (SELECT o.customer_id FROM pmt_transactions t
-        INNER JOIN pmt_orders o ON o.order_id = t.order_id
+        SELECT COUNT(DISTINCT customer_id) FROM pmt_orders o
         ]]>
         <![CDATA[
-        WHERE o.create_time >= #{begin} AND o.create_time < #{end}
+        WHERE o.create_time >= #{begin} AND o.create_time < #{end} AND o.status>4
         ]]>
         <if test="client_ids!=null">
             AND o.client_id IN
@@ -392,30 +391,31 @@
         <if test="client_ids==null and client_id != null">
             and o.client_id=#{client_id}
         </if>
-        <if test="org_id!=null and org_ids==null">and t.org_id=#{org_id}</if>
-        <if test="org_ids!=null">and t.org_id in
+        <if test="org_id!=null and org_ids==null">and o.org_id=#{org_id}</if>
+        <if test="org_ids!=null">and o.org_id in
             <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach>
         </if>
         <if test="channel !=null">and o.channel = #{channel}</if>
-        <![CDATA[
-        GROUP BY o.customer_id) p
-        where p.customer_id NOT IN (SELECT o.customer_id FROM pmt_transactions t INNER JOIN pmt_orders o ON o.order_id = t.order_id
-        ]]>
-        <![CDATA[
-        WHERE o.create_time < #{begin}
-        ]]>
-        <if test="client_ids!=null">
-            AND o.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 o.client_id=#{client_id}
-        </if>
-        <![CDATA[
+        AND EXISTS (
+            <![CDATA[
+            select customer_id from pmt_orders oo where oo.customer_id=o.customer_id
+            and oo.create_time < #{begin} AND oo.status>4
+            ]]>
+            <if test="client_ids!=null">
+                AND oo.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 oo.client_id=#{client_id}
+            </if>
+            <if test="org_id!=null and org_ids==null">and oo.org_id=#{org_id}</if>
+            <if test="org_ids!=null">and oo.org_id in
+                <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach>
+            </if>
+            <if test="channel !=null">and oo.channel = #{channel}</if>
         )
-        ]]>
     </select>
     <select id="countOldCustomers" resultType="java.lang.Integer">
         <![CDATA[