From b1c04352b694e28d52bf14779201337ad5299297 Mon Sep 17 00:00:00 2001
From: Yixian <davepotter@163.com>
Date: Fri, 12 Nov 2021 13:47:43 +0800
Subject: [PATCH] =?UTF-8?q?hotfix:=20=E4=BC=98=E5=8C=96=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E6=95=B0=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mappers/TransactionAnalysisMapper.xml     | 33 +++++--------------
 uidocker/conf.d/default.conf                  | 26 ++++++++-------
 2 files changed, 23 insertions(+), 36 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 afd6e95a0..a01539533 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
@@ -414,11 +414,9 @@
 
     <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
-        ]]>
-        <![CDATA[
-        WHERE o.create_time >= #{begin} AND o.create_time < #{end}
+        SELECT COUNT(customer_id) FROM (
+            SELECT o.customer_id,min(o.create_time) first_pay FROM pmt_orders o
+        WHERE o.create_time < #{end} and o.status>4
         ]]>
         <if test="client_ids!=null">
             AND o.client_id IN
@@ -429,30 +427,17 @@
         <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[
-        )
+        GROUP BY o.customer_id
+            having first_pay>=#{begin}
+            ) p
         ]]>
+
     </select>
     <select id="countOldCustomers" resultType="java.lang.Integer">
         <![CDATA[
diff --git a/uidocker/conf.d/default.conf b/uidocker/conf.d/default.conf
index e3deafc4f..f5ee4fe3c 100644
--- a/uidocker/conf.d/default.conf
+++ b/uidocker/conf.d/default.conf
@@ -20,6 +20,9 @@ server {
 server {
     listen 3000;
     server_name _ default;
+    underscores_in_headers on;
+    proxy_ignore_client_abort on;
+    client_max_body_size 0;
 
     location ~ ^/api/v1.0/retail/((?!(app|rsvc)).)+ {
         proxy_pass http://rppaycenter;
@@ -31,7 +34,7 @@ server {
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
 
         proxy_set_header Host $host;
-        proxy_set_header Real-IP $remote_addr;
+        
 
         proxy_read_timeout 300s;
 
@@ -47,7 +50,7 @@ server {
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
 
         proxy_set_header Host $host;
-        proxy_set_header Real-IP $remote_addr;
+        
 
         proxy_read_timeout 300s;
     }
@@ -62,7 +65,7 @@ server {
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
 
         proxy_set_header Host $host;
-        proxy_set_header Real-IP $remote_addr;
+        
 
         proxy_read_timeout 300s;
     }
@@ -78,7 +81,7 @@ server {
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
 
         proxy_set_header Host $host;
-        proxy_set_header Real-IP $remote_addr;
+        
 
         proxy_read_timeout 300s;
 
@@ -94,7 +97,7 @@ server {
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
 
         proxy_set_header Host $host;
-        proxy_set_header Real-IP $remote_addr;
+        
 
         proxy_read_timeout 300s;
     }
@@ -109,7 +112,7 @@ server {
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
 
         proxy_set_header Host $host;
-        proxy_set_header Real-IP $remote_addr;
+        
 
         proxy_read_timeout 300s;
 
@@ -125,7 +128,7 @@ server {
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
 
         proxy_set_header Host $host;
-        proxy_set_header Real-IP $remote_addr;
+        
 
         proxy_read_timeout 300s;
 
@@ -141,7 +144,7 @@ server {
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
 
         proxy_set_header Host $host;
-        proxy_set_header Real-IP $remote_addr;
+        
 
         proxy_read_timeout 300s;
 
@@ -157,7 +160,6 @@ server {
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
 
         proxy_set_header Host $host;
-        proxy_set_header Real-IP $remote_addr;
 
         proxy_read_timeout 300s;
 
@@ -173,7 +175,7 @@ server {
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
 
         proxy_set_header Host $host;
-        proxy_set_header Real-IP $remote_addr;
+        
 
         proxy_read_timeout 300s;
     }
@@ -188,7 +190,7 @@ server {
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
 
         proxy_set_header Host $host;
-        proxy_set_header Real-IP $remote_addr;
+        
 
         proxy_read_timeout 300s;
     }
@@ -203,7 +205,7 @@ server {
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
 
         proxy_set_header Host $host;
-        proxy_set_header Real-IP $remote_addr;
+        
 
         proxy_read_timeout 300s;
     }