From c40fce1926fa820ccc47d06e6c67fc915e34005a Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Thu, 27 Feb 2020 11:00:41 +0800
Subject: [PATCH] fix app orders test

---
 pom.xml                                                        | 2 +-
 .../royalpay/payment/manage/mappers/payment/OrderMapper.xml    | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index eef42473c..ab656a9ea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>1.3.62</version>
+    <version>1.3.63</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/mappers/payment/OrderMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml
index bbcb11c6c..4777e7c9c 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml
@@ -922,7 +922,8 @@
         t.settle_amount,
         t.clearing_status = 2  pre_auth
         from pmt_orders o
-        left join pmt_transactions t on t.order_id=o.order_id and t.channel!='Settlement' and t.system_generate=0
+        left join pmt_transactions t on t.order_id=o.order_id and t.channel!='Settlement'
+        AND (t.system_generate = 0 or (t.system_generate = 1 and t.remark like '%RYCBSM%'))
         <where>
             <if test="client_ids!=null">
                 AND o.client_id IN