From ff14cdd63be1f9af13f7eb6801b570bf1bbe57a9 Mon Sep 17 00:00:00 2001 From: luoyang Date: Sun, 30 Sep 2018 17:45:30 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9A=82=E6=97=B6=E5=85=B3=E9=97=ADclearin?= =?UTF-8?q?g=E8=87=AA=E5=8A=A8=E7=BB=AD=E7=BA=A6=E6=97=B6=E6=9B=B4?= =?UTF-8?q?=E6=96=B0Rpay+?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../payment/manage/merchants/core/impls/ClientManagerImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 e18ded9b0..15d9d6f59 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 @@ -4018,8 +4018,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid record.put("remark", "费率到期系统自动延期1年"); clientRateMapper.saveRate(record); if ("Rpay".equals(o.getString("rate_name"))) { - rpayApi.modifySurchargeConfig(clientMapper.findClient(client_id)); - + //rpayApi.modifySurchargeConfig(clientMapper.findClient(client_id)); } } clientModifySupport.processClientConfigModify(new SwitchPermissionModify(null, client.getString("client_moniker"), "tax_in_surcharge", false)); From a953b9042d830e846ba1448646ffbd0dd0bc2190 Mon Sep 17 00:00:00 2001 From: "taylor.dang" Date: Mon, 1 Oct 2018 18:02:14 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix=E8=AE=A2=E5=8D=95=E6=B5=81=E6=B0=B4?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E4=B8=BA=E7=B3=BB=E7=BB=9F=E5=88=9B=E5=BB=BA?= =?UTF-8?q?transaction=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/royalpay/payment/manage/mappers/payment/OrderMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 d88d057c9..f6fd45b4b 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 @@ -659,7 +659,7 @@ o.order_detail, t.clearing_amount, t.refund_id, - t.transaction_time, + t.create_time transaction_time, t.transaction_type, t.transaction_id, t.exchange_rate,