From 929dcfb42745ce05acac63854b43b6a820a55382 Mon Sep 17 00:00:00 2001
From: dulingling <dll19920503@qq.com>
Date: Mon, 9 Mar 2020 10:41:30 +0800
Subject: [PATCH] =?UTF-8?q?Upd:=E4=BF=AE=E6=94=B9=E8=AE=A1=E7=AE=97?=
 =?UTF-8?q?=E6=96=B0=E8=80=81=E6=B6=88=E8=B4=B9=E8=80=85=E4=BA=BA=E5=A4=B4?=
 =?UTF-8?q?=E6=95=B0=EF=BC=8C=E6=AF=8F=E6=97=A5=E6=95=B0=E6=8D=AE=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |  2 +-
 .../mappers/TransactionAnalysisMapper.xml     | 46 +++++++++----------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/pom.xml b/pom.xml
index cbfe4ba4b..139e8631c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>1.3.89</version>
+    <version>1.3.90</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>1.8.0</jib-maven-plugin.version>
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 81dab16c5..c71b6d2ae 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
@@ -406,10 +406,11 @@
 
     <select id="countNewCustomers" resultType="java.lang.Integer">
         <![CDATA[
-        SELECT COUNT(DISTINCT customer_id) FROM pmt_orders o
+        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
         ]]>
         <![CDATA[
-        WHERE o.create_time >= #{begin} AND o.create_time < #{end} AND o.status>4
+        WHERE o.create_time >= #{begin} AND o.create_time < #{end}
         ]]>
         <if test="client_ids!=null">
             AND o.client_id IN
@@ -420,31 +421,30 @@
         <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 o.org_id=#{org_id}</if>
-        <if test="org_ids!=null">and o.org_id in
+        <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
             <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach>
         </if>
         <if test="channel !=null">and o.channel = #{channel}</if>
-        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>
+        <![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[
         )
+        ]]>
     </select>
     <select id="countOldCustomers" resultType="java.lang.Integer">
         <![CDATA[