From 11352a45250a62cc77792e326f26f43e63d5afda Mon Sep 17 00:00:00 2001
From: dulingling <dll19920503@qq.com>
Date: Fri, 17 Jul 2020 14:04:32 +0800
Subject: [PATCH 1/2] =?UTF-8?q?Upd:=E4=BF=AE=E5=A4=8D=E5=95=86=E6=88=B7?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=86=E6=9E=90-=E4=BA=A4=E6=98=93?=
 =?UTF-8?q?=E5=88=86=E5=B8=83cardpayment=E6=95=B0=E6=8D=AE=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                        | 2 +-
 .../manage/analysis/mappers/TransactionAnalysisMapper.xml      | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 929e7923e..277b9c0f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>2.3.40</version>
+    <version>2.3.41</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>2.4.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 196708ac7..6b4b36464 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
@@ -615,6 +615,9 @@
         <if test="trade_type=='Share Link'">
             and o.gateway=14
         </if>
+        <if test="trade_type=='Card Payment'">
+            and o.gateway=17
+        </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>

From 9637a9366da7edb1f48fc9da5f89380280d00e63 Mon Sep 17 00:00:00 2001
From: dulingling <dll19920503@qq.com>
Date: Fri, 17 Jul 2020 14:13:35 +0800
Subject: [PATCH 2/2] =?UTF-8?q?upd:=E5=95=86=E6=88=B7=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=88=86=E6=9E=90cardpaymenr=E6=95=B0=E6=8D=AE=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manage/analysis/mappers/TransactionAnalysisMapper.xml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

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 6b4b36464..afd6e95a0 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
@@ -615,8 +615,14 @@
         <if test="trade_type=='Share Link'">
             and o.gateway=14
         </if>
+        <if test="trade_type=='Native JSAPI'">
+            and o.gateway=15
+        </if>
         <if test="trade_type=='Card Payment'">
-            and o.gateway=17
+            and o.gateway in (16,17)
+         </if>
+        <if test="trade_type=='Direct Debit'">
+            and o.gateway=18
         </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