From 370ea700ea6bece6a597a87499b95b36061e8933 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Fri, 28 Feb 2020 15:48:34 +0800
Subject: [PATCH 1/3] fix app boolean int

---
 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 344a0e40a..4a5a017bd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>1.3.72</version>
+    <version>1.3.73</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..6aa7d2669 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%',TRUE,FALSE) 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%'))

From 85e0ae4a503b41c6413de3aa64cdee979dc2f045 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Fri, 28 Feb 2020 18:09:46 +0800
Subject: [PATCH 2/3] fix app boolean int

---
 pom.xml                                                         | 2 +-
 .../manage/appclient/core/impls/RetailAppServiceImp.java        | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 4a5a017bd..922716036 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>1.3.73</version>
+    <version>1.3.74</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/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java
index b1dc36644..84301c7bf 100644
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java
@@ -985,6 +985,7 @@ public class RetailAppServiceImp implements RetailAppService {
         TimeZoneUtils.switchTimeZone(orders, query.getTimezone(), "create_time", "transaction_time", "confirm_time");
         ArrayList<String> dateContains = new ArrayList<>();
         for (JSONObject order : orders) {
+            order.put("geek_apply_deduction", order.getBooleanValue("geek_apply_deduction"));
             Calendar calendar = (Calendar) order.get("transaction_time");
             if (timezone != null) {
                 calendar.setTimeZone(TimeZone.getTimeZone(timezone));

From e4a0a4ebfae0ce18593d1c3bb0d2bf22ceecfc7b Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Fri, 28 Feb 2020 19:28:16 +0800
Subject: [PATCH 3/3] fix app boolean int

---
 pom.xml                                                         | 2 +-
 .../activities/app_index/core/impls/AppActServiceImp.java       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 922716036..4d83957a0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>1.3.74</version>
+    <version>1.3.75</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/java/au/com/royalpay/payment/manage/activities/app_index/core/impls/AppActServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/activities/app_index/core/impls/AppActServiceImp.java
index 3c75e180f..5bd61fb08 100644
--- a/src/main/java/au/com/royalpay/payment/manage/activities/app_index/core/impls/AppActServiceImp.java
+++ b/src/main/java/au/com/royalpay/payment/manage/activities/app_index/core/impls/AppActServiceImp.java
@@ -71,7 +71,7 @@ public class AppActServiceImp implements AppActService {
     public JSONObject getAppActPopup(){
         JSONObject appActPopup = actAppMapper.getAppActPopup();
         if (appActPopup == null) {
-            return new JSONObject();
+            return null;
         }
         int appLinkType = appActPopup.getIntValue("show_type");
         switch (appLinkType) {