From 2dd4ababbfa4396d5fbd8f8b55690ea3aade9a78 Mon Sep 17 00:00:00 2001
From: duLingLing <dll19920503@qq.com>
Date: Mon, 9 Dec 2019 23:32:50 +1000
Subject: [PATCH] =?UTF-8?q?Upd:=E6=9C=8D=E5=8A=A1=E6=8F=90=E4=BE=9Bspms?=
 =?UTF-8?q?=E8=AF=BB=E5=8F=96=E6=95=B0=E6=8D=AE=E7=BB=93=E6=9E=84=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |  2 +-
 .../mappers/TransactionAnalysisMapper.java    |  2 ++
 .../core/DataAnalysisServiceImpl.java         |  4 +--
 .../mappers/TransactionAnalysisMapper.xml     | 29 +++++++++++++++++--
 4 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index ef51f8c0f..882361977 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>1.3.2</version>
+    <version>1.3.3</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/java/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.java b/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.java
index 6e9a570e9..3be3a6e55 100644
--- a/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.java
+++ b/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.java
@@ -18,6 +18,8 @@ import java.util.List;
 public interface TransactionAnalysisMapper {
     BigDecimal analysisTotalAmount(JSONObject params);
 
+    BigDecimal analysisTotalAmountProvisionService (JSONObject params);
+
     double analysisTotalCount(JSONObject params);
 
     double analysisRefundAmount(JSONObject params);
diff --git a/src/main/java/au/com/royalpay/payment/manage/dataAnalysis/core/DataAnalysisServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/dataAnalysis/core/DataAnalysisServiceImpl.java
index a5331aeb3..96f7ec5ca 100644
--- a/src/main/java/au/com/royalpay/payment/manage/dataAnalysis/core/DataAnalysisServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/dataAnalysis/core/DataAnalysisServiceImpl.java
@@ -33,8 +33,8 @@ public class DataAnalysisServiceImpl implements DataAnalysisService {
         response.put("total_partners", clientAnalysisMapper.countClients(params));
         //产生交易的商户数
         response.put("traded_partners", clientAnalysisMapper.countTradedPartners(params));
-        //交易总额
-        response.put("trade_amount", transactionAnalysisMapper.analysisTotalAmount(params));
+        //交易总额,该处另外开启新视线接口，专提供pms获取数据
+        response.put("trade_amount", transactionAnalysisMapper.analysisTotalAmountProvisionService(params));
         return response;
     }
 
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 5b08eaac6..b6204ac32 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
@@ -64,9 +64,34 @@
         <![CDATA[
         SELECT ifnull(sum(if(l.transaction_type = 'Credit',l.clearing_amount,-l.clearing_amount)), 0)
         FROM pmt_transactions l
-            INNER JOIN pmt_orders o ON o.order_id = l.order_id AND o.create_time >= #{begin} AND
-                                       o.create_time <= #{end}
+            INNER JOIN pmt_orders o ON o.order_id = l.order_id AND c.create_time >= #{begin} AND
+                                       c.create_time <= #{end}
+        WHERE (l.transaction_type = 'Credit' or l.refund_id is not null)
+        ]]>
+        <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>
+        <if test="org_id!=null and org_ids==null">and l.org_id=#{org_id}</if>
+        <if test="org_ids!=null">and l.org_id in
+            <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach>
+        </if>
+    </select>
+
+    <select id="analysisTotalAmountProvisionService" resultType="java.math.BigDecimal">
+        <![CDATA[
+        SELECT ifnull(sum(if(l.transaction_type = 'Credit',l.clearing_amount,0)), 0)
+        FROM pmt_transactions l
         WHERE (l.transaction_type = 'Credit' or l.refund_id is not null)
+          AND l.channel != 'Settlement'
+          AND l.channel != 'System'
+           AND l.create_time >= #{begin}
+           AND l.create_time <= #{end}
         ]]>
         <if test="client_ids!=null">
             AND o.client_id IN