diff --git a/pom.xml b/pom.xml index 344a0e40a..4d83957a0 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 manage - 1.3.72 + 1.3.75 UTF-8 1.8.0 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) { 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 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)); 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%'))