From bf8a94a62076b3fdd9640c9f0b984ce7ebefd918 Mon Sep 17 00:00:00 2001 From: luoyang Date: Tue, 16 Oct 2018 12:56:08 +0800 Subject: [PATCH 1/2] fix rpay+switchMerchantSettle --- .../manage/merchants/core/impls/ClientManagerImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java index 5e86590dc..f928885fd 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java @@ -3193,7 +3193,9 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid } clientModifySupport.processClientConfigModify(new SwitchPermissionModify(account, clientMoniker, "skip_clearing", skip_clearing)); client.put("skip_clearing", skip_clearing); - rpayApi.switchMerchantSettle(client); + if (client.getString("rpay_enterprise_id") != null) { + rpayApi.switchMerchantSettle(client); + } } @Override From 30e1561315a9fd3490a0f21adf76ca2244f5f787 Mon Sep 17 00:00:00 2001 From: "taylor.dang" Date: Wed, 17 Oct 2018 13:04:48 +0800 Subject: [PATCH 2/2] =?UTF-8?q?app=20rpay=E8=AE=A2=E5=8D=95=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../royalpay/payment/manage/mappers/payment/OrderMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 2b0482c19..ad184d835 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 @@ -698,9 +698,9 @@ o.refund_amount refund_fee, o.customer_id, o.order_detail, - CASE o.channel WHEN 'Rpay' THEN o.customer_payment_amount ELSE t.clearing_amount END clearing_amount, + t.clearing_amount, t.refund_id, - CASE o.channel WHEN 'Rpay' THEN t.create_time ELSE t.transaction_time END transaction_time, + IFNULL(t.create_time,t.transaction_time) transaction_time, t.transaction_type, t.transaction_id, t.exchange_rate,