Merge remote-tracking branch 'origin/develop' into develop

pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>1.3.72</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>

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) {

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));

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%'))