From 2959cea5d09fb277b0120b39ae6fb2febb8e043a Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Fri, 28 Feb 2020 10:45:54 +0800
Subject: [PATCH] =?UTF-8?q?fix=20app=20orders=E6=96=B0=E5=A2=9E=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5geek=5Fapply=5Fdeduction?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 2f7e9e189..c9b3cc867 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>1.3.69</version>
+    <version>1.3.70</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 4777e7c9c..2d5f370cb 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
@@ -920,7 +920,8 @@
         t.exchange_rate,
         t.clearing_status,
         t.settle_amount,
-        t.clearing_status = 2  pre_auth
+        t.clearing_status = 2  pre_auth,
+        IF( t.remark like '%RYCBSM%',1,0) as geek_apply_deduction
         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 or (t.system_generate = 1 and t.remark like '%RYCBSM%'))