From eb24dd7ad408094c22d0ac84779816ff97765277 Mon Sep 17 00:00:00 2001 From: luoyang Date: Tue, 25 Sep 2018 11:07:38 +0800 Subject: [PATCH 01/12] fix wx_settlements orderby desc --- .../ui/static/config/devtools/templates/wx_settlements.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/ui/static/config/devtools/templates/wx_settlements.html b/src/main/ui/static/config/devtools/templates/wx_settlements.html index 368c87bf2..dacfa0a9b 100644 --- a/src/main/ui/static/config/devtools/templates/wx_settlements.html +++ b/src/main/ui/static/config/devtools/templates/wx_settlements.html @@ -53,7 +53,7 @@ - + From 8e0d916897443122f9bbde5af08500bd4d04a7b5 Mon Sep 17 00:00:00 2001 From: luoyang Date: Tue, 25 Sep 2018 11:27:35 +0800 Subject: [PATCH 02/12] add client_partner_detail googleMap --- src/main/ui/static/payment/partner/partner.js | 7 +++++++ .../partner/templates/client_partner_detail.html | 13 +++++++++++++ 2 files changed, 20 insertions(+) diff --git a/src/main/ui/static/payment/partner/partner.js b/src/main/ui/static/payment/partner/partner.js index 275b1190e..e4cdb0451 100644 --- a/src/main/ui/static/payment/partner/partner.js +++ b/src/main/ui/static/payment/partner/partner.js @@ -70,6 +70,13 @@ define(['angular', 'decimal', 'uiRouter', 'ngBootSwitch', 'ngFileUpload'], funct $scope.partner = partner.data; $scope.partner.partner_type = $scope.partner.website ? 'website' : 'photo'; + $scope.getMerchantLocation = function () { + $http.get('/sys/partners/' + $scope.partner.client_moniker + '/location').then(function (resp) { + $scope.merchant_location = resp.data; + }); + }; + $scope.getMerchantLocation(); + $scope.uploadLogo = function (file) { if (file != null) { if (file.size > 1 * 1024 * 1024) { diff --git a/src/main/ui/static/payment/partner/templates/client_partner_detail.html b/src/main/ui/static/payment/partner/templates/client_partner_detail.html index 9c8ebcfa4..44ee74b66 100644 --- a/src/main/ui/static/payment/partner/templates/client_partner_detail.html +++ b/src/main/ui/static/payment/partner/templates/client_partner_detail.html @@ -303,6 +303,19 @@ + +
+
Location + + +
+
+
+ +
+
+
From a6ea30b8cadbccfac26844a85de5b33dbd6a3f56 Mon Sep 17 00:00:00 2001 From: luoyang Date: Tue, 25 Sep 2018 12:22:17 +0800 Subject: [PATCH 03/12] add client_partner_detail googleMap --- src/main/ui/static/invoice/templates/invoice_assistant.html | 2 +- src/main/ui/static/payment/invoice/templates/invoice.html | 2 +- .../ui/static/payment/tradelog/templates/balance_report.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/ui/static/invoice/templates/invoice_assistant.html b/src/main/ui/static/invoice/templates/invoice_assistant.html index d00a3a693..40315fcc0 100644 --- a/src/main/ui/static/invoice/templates/invoice_assistant.html +++ b/src/main/ui/static/invoice/templates/invoice_assistant.html @@ -239,7 +239,7 @@ -

- + diff --git a/src/main/ui/static/payment/invoice/templates/invoice.html b/src/main/ui/static/payment/invoice/templates/invoice.html index 90816babf..c045936f1 100644 --- a/src/main/ui/static/payment/invoice/templates/invoice.html +++ b/src/main/ui/static/payment/invoice/templates/invoice.html @@ -233,7 +233,7 @@ -

- + diff --git a/src/main/ui/static/payment/tradelog/templates/balance_report.html b/src/main/ui/static/payment/tradelog/templates/balance_report.html index 915719219..c6acfce95 100644 --- a/src/main/ui/static/payment/tradelog/templates/balance_report.html +++ b/src/main/ui/static/payment/tradelog/templates/balance_report.html @@ -345,7 +345,7 @@ -

- + From 6ea7c26d9684834102b2103d8c45767fba52731e Mon Sep 17 00:00:00 2001 From: luoyang Date: Tue, 25 Sep 2018 14:03:19 +0800 Subject: [PATCH 04/12] fix rpay - remark_alter --- src/main/ui/static/templates/rpay/v1/payment.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/ui/static/templates/rpay/v1/payment.js b/src/main/ui/static/templates/rpay/v1/payment.js index 7cbd9ff0a..2162eae11 100644 --- a/src/main/ui/static/templates/rpay/v1/payment.js +++ b/src/main/ui/static/templates/rpay/v1/payment.js @@ -215,7 +215,7 @@ $(function () { showWeuiDialog(config); }); - $('#key_P').click(function () { +/* $('#key_P').click(function () { if (window.requireRemark) { if (!dataCache.remark) { var config = { @@ -226,7 +226,7 @@ $(function () { } } - }); + });*/ $('#key_P').bind('touchstart', function () { if (window.requireRemark) { From eac17d2434df830a79198d65e570feb26f0dd811 Mon Sep 17 00:00:00 2001 From: luoyang Date: Tue, 25 Sep 2018 14:10:51 +0800 Subject: [PATCH 05/12] fix rpay - remark_alter --- src/main/ui/static/templates/rpay/v1/payment.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/ui/static/templates/rpay/v1/payment.js b/src/main/ui/static/templates/rpay/v1/payment.js index 2162eae11..a63f252b7 100644 --- a/src/main/ui/static/templates/rpay/v1/payment.js +++ b/src/main/ui/static/templates/rpay/v1/payment.js @@ -215,18 +215,18 @@ $(function () { showWeuiDialog(config); }); -/* $('#key_P').click(function () { + $('#key_P').click(function () { if (window.requireRemark) { if (!dataCache.remark) { var config = { - title: '请先输入备注', + title: 'Please enter the remarks first', template: '' }; showWeuiDialog(config); } } - });*/ + }); $('#key_P').bind('touchstart', function () { if (window.requireRemark) { From 053d85d61e173ff3015802cf4dbea4c8fed0fc43 Mon Sep 17 00:00:00 2001 From: hellolujian <1370256381@qq.com> Date: Wed, 26 Sep 2018 11:09:29 +0800 Subject: [PATCH 06/12] =?UTF-8?q?[fix]notify=20log=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E5=8F=8A?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/logview/beans/NotifyQueryBean.java | 17 ++++++++++ .../mappers/log/NotifyErrorLogMapper.xml | 32 +++++++++++++++++++ .../config/logview/templates/notify_log.html | 19 ++++++++++- 3 files changed, 67 insertions(+), 1 deletion(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/logview/beans/NotifyQueryBean.java b/src/main/java/au/com/royalpay/payment/manage/logview/beans/NotifyQueryBean.java index 725f63337..72ec88677 100644 --- a/src/main/java/au/com/royalpay/payment/manage/logview/beans/NotifyQueryBean.java +++ b/src/main/java/au/com/royalpay/payment/manage/logview/beans/NotifyQueryBean.java @@ -15,6 +15,10 @@ public class NotifyQueryBean { private int page = 1; private int limit = 20; private String moniker; + + // 新增orderId查询字段 + private String orderId; + private String clientOrderId; private String date; private Boolean success; @@ -24,6 +28,11 @@ public class NotifyQueryBean { if (StringUtils.isNotEmpty(moniker)) { param.put("client_moniker", moniker); } + + if (StringUtils.isNotEmpty(orderId)) { + param.put("order_id", orderId); + } + if (StringUtils.isNotEmpty(clientOrderId)) { param.put("client_order_id", clientOrderId); } @@ -88,4 +97,12 @@ public class NotifyQueryBean { public void setSuccess(Boolean success) { this.success = success; } + + public String getOrderId() { + return orderId; + } + + public void setOrderId(String orderId) { + this.orderId = orderId; + } } diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/log/NotifyErrorLogMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/log/NotifyErrorLogMapper.xml index 66e84f217..3e17fbc8e 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/mappers/log/NotifyErrorLogMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/log/NotifyErrorLogMapper.xml @@ -1,6 +1,8 @@ + + + + + +
+ +
@@ -61,6 +76,7 @@ Time Order ID + Client Order ID Notify Url Success Http Code @@ -71,7 +87,8 @@ - + + From 3959b7c0715b11069fb5e77a9a8b66eacb812d46 Mon Sep 17 00:00:00 2001 From: luoyang Date: Wed, 26 Sep 2018 14:08:32 +0800 Subject: [PATCH 07/12] add select_nap --- .../impls/CustomersAnalysisServiceImp.java | 1 + .../analysis/mappers/OrderAnalysisMapper.xml | 14 +++++++++++- .../ui/static/analysis/customer_analysis.js | 1 + .../analysis/templates/customer_analysis.html | 22 +++++++++++++++++++ 4 files changed, 37 insertions(+), 1 deletion(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/CustomersAnalysisServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/CustomersAnalysisServiceImp.java index 62d967da8..88e26c0d1 100644 --- a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/CustomersAnalysisServiceImp.java +++ b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/CustomersAnalysisServiceImp.java @@ -78,6 +78,7 @@ public class CustomersAnalysisServiceImp implements CustomersAnalysisService { PageList logs = orderAnalysisMapper.listCustomersData(params, new PageBounds(page, limit, Order.formString("amount.desc"))); JSONObject result = PageListUtils.buildPageListResult(logs); result.put("analysis", orderAnalysisMapper.listCustomersDataAnalysis(params)); + result.put("openid_type", params.getIntValue("openid_type")); return result; } diff --git a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/OrderAnalysisMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/OrderAnalysisMapper.xml index d8c12acdc..81cee3fb0 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/OrderAnalysisMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/OrderAnalysisMapper.xml @@ -197,10 +197,16 @@
@@ -99,6 +100,7 @@ + @@ -110,6 +112,26 @@ + + + + From 441800b599704dfe6344d4656d7cd53ca5eb04e3 Mon Sep 17 00:00:00 2001 From: luoyang Date: Wed, 26 Sep 2018 14:15:14 +0800 Subject: [PATCH 08/12] add select_nap --- src/main/ui/static/images/nap.png | Bin 0 -> 1203 bytes src/main/ui/static/images/royalpay_sign_ln.png | Bin 0 -> 1504 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/ui/static/images/nap.png create mode 100644 src/main/ui/static/images/royalpay_sign_ln.png diff --git a/src/main/ui/static/images/nap.png b/src/main/ui/static/images/nap.png new file mode 100644 index 0000000000000000000000000000000000000000..613b393fa21a6c7df6e338b0de8999da031822b1 GIT binary patch literal 1203 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+n3Xd_B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc&_u!9QqR!T z(8R(}N5ROz&{*HVSl`fC*U-qyz|zXlQ~?TIxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;NpiyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr7KMf`)Hma%LWg zuL;)R>ucqiS6q^qmz?V9Vygr+LN7Bj#mdOh+0fG2&Be*m%*4>p)xy!#+1$d!$=T7_ z#n8yq$pxm@B|o_|H#M&WrZ)wl*A=H;P+G_>0NU)5T9jFqn&MWJpQ`}&vsET;w>aT6 z52`l>w_BWX>eUB2MjsTjNHGl)0wy026P|8?9C*r4%>yR)B4E0nT)Zrjfq_xY)5S5Q z;#Shb=pXmH8XFVU1Wp@IV3T7iv{Js%Anwp+!Cd)3Rd|9xvVwd^BhL?~M#lIV5*n-r z41Ro(=eTD7_;TI(Pxl+93E~a24l+y;vS<8zoIB{tLv@u82O3YbeNgw{Il{iu zQH;Ime1g6LX9KU}vc#O6M;jcTEL4#E*uYca+Q_)xA&z5_iZwHf1cPjHdv)7Kb4O4y N;_2$=vd$@?2>=tDlC}T< literal 0 HcmV?d00001 diff --git a/src/main/ui/static/images/royalpay_sign_ln.png b/src/main/ui/static/images/royalpay_sign_ln.png new file mode 100644 index 0000000000000000000000000000000000000000..72178aee3c77710dc4c5818afa021185dbbeaeeb GIT binary patch literal 1504 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+n3Xd_B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc&_u!9QqR!T z(8R(}N5ROz&{*HVSl`fC*U-qyz|zXlQ~?TIxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;NpiyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr7KMf`)Hma%LWg zuL;)R>ucqiS6q^qmz?V9Vygr+LN7Bj#mdOh+0fG2&Cp)xy!#+1$d!$=T7_ z#n8yq$pxm@B|o_|H#M&WrZ)wl*Ab^)P+G_>0NU)5T9jFqn&MWJpQ`}&vsET;x0vHJ z52`l>w_7Z5>eUB2MjsTjNHGl)0wy026P|8?9C*r4%>yR)B4D~s|F8v^ru;@JFZtFF2;5+aXRA9RXx+%VyWptO7-_kRcTH91?PJ6#U#6O4_Vcw<6I zBd?g4opR>oNtrHEhNo6&N?tX*t;tmuv4*)Tn-(Pg=Gt)V{mN_U%XJ%XXI0d*YacxM`O>o3NgsKZ z+FyE6`|@b8=DB+56)xHfRW$_et+V_+dkWuokGS&Z(WM8{PbSyTyb`seNwDeq!h($|waPp8 z8nXV5*xV9%bpE9p!3E10p6yebDRi>W(8=J+`KY@`*jSgH+<4n2xVoT}rJ_A6k;EHO{8YVNX2EtgXIei%>`jd*v}}iHkb}`L>1G_X{2Q z^VQ^;RJirMBimM-EB27xr=5F4v)A^>mdrcf50;(r-_>!(`k7OB!jWBRTp7zM@7qL| z7f1byPq?bBb91X+(2NJWAI;J(Is4?+%?szIwK#>We!nm3y5xK3gXYoMS9}7k|BEIt Yr2aef|A=YAKTw(L>FVdQ&MBb@0JpV7ivR!s literal 0 HcmV?d00001 From a8a1abda94c2664ddfcb7710d35257ed202ce168 Mon Sep 17 00:00:00 2001 From: luoyang Date: Wed, 26 Sep 2018 14:23:29 +0800 Subject: [PATCH 09/12] pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index adaacec07..cfb6e206d 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ au.com.royalpay.payment payment-parent - 0.2.0 + 0.2.0-dev 4.0.0 From aa2e4bc37eaa1abd3f644a38a176f531135aab7d Mon Sep 17 00:00:00 2001 From: luoyang Date: Wed, 26 Sep 2018 14:30:53 +0800 Subject: [PATCH 10/12] fix select_nap --- .../payment/manage/analysis/mappers/OrderAnalysisMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/OrderAnalysisMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/OrderAnalysisMapper.xml index 81cee3fb0..6c3265277 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/OrderAnalysisMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/OrderAnalysisMapper.xml @@ -204,7 +204,7 @@ LEFT JOIN sys_customer_relation r on r.globalpay_openid = o.customer_id - + LEFT JOIN sys_customer_relation r on r.wechat_openid = o.customer_id From 562840cedaa43534a0dfbb5cfd98dee9ea7e71f4 Mon Sep 17 00:00:00 2001 From: hellolujian <1370256381@qq.com> Date: Wed, 26 Sep 2018 16:21:51 +0800 Subject: [PATCH 11/12] =?UTF-8?q?[fix]=E5=95=86=E6=88=B7=E7=AB=AF=E6=94=AF?= =?UTF-8?q?=E4=BB=98=E7=A7=98=E9=92=A5=E6=94=AF=E6=8C=81=E5=88=B7=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/ui/static/payment/partner/partner.js | 22 +++++++++++++++++-- .../templates/client_payment_info.html | 10 ++++++++- 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/src/main/ui/static/payment/partner/partner.js b/src/main/ui/static/payment/partner/partner.js index e4cdb0451..7096890c6 100644 --- a/src/main/ui/static/payment/partner/partner.js +++ b/src/main/ui/static/payment/partner/partner.js @@ -560,7 +560,7 @@ define(['angular', 'decimal', 'uiRouter', 'ngBootSwitch', 'ngFileUpload'], funct }; }]); - app.controller('clientPaymentInfoCtrl', ['$scope', '$http', 'commonDialog', function ($scope, $http, commonDialog) { + app.controller('clientPaymentInfoCtrl', ['$scope', '$http', '$state', 'commonDialog', function ($scope, $http, $state, commonDialog) { $scope.paymentInfo = $scope.partner; $scope.old_customer_surcharge_rate = angular.copy($scope.partner.customer_surcharge_rate); $scope.qrConfig = {currency: 'AUD'}; @@ -829,7 +829,25 @@ define(['angular', 'decimal', 'uiRouter', 'ngBootSwitch', 'ngFileUpload'], funct $scope.bankshow = false; }; - + // 新增需求，商户端刷新支付秘钥 + $scope.refreshCredential = function () { + commonDialog.confirm({ + title: 'Warning', + content: 'Refresh Credential will expire the current one, ' + + 'which will cause the current payment service disabled. ' + + 'Are you sure going on?' + }).then(function () { + $http.put('/sys/partners/' + $scope.partner.client_moniker + '/credential_code').then(function () { + $state.reload(); + }, function (resp) { + commonDialog.alert({ + title: 'Error', + content: resp.data.message, + type: 'error' + }) + }) + }) + }; }]); app.controller('clientPaymentMaterialCtrl', ['$scope', '$http', 'partner', function ($scope, $http, partner) { diff --git a/src/main/ui/static/payment/partner/templates/client_payment_info.html b/src/main/ui/static/payment/partner/templates/client_payment_info.html index 534d6ca61..ad9158a14 100644 --- a/src/main/ui/static/payment/partner/templates/client_payment_info.html +++ b/src/main/ui/static/payment/partner/templates/client_payment_info.html @@ -87,7 +87,15 @@
-

+

+ + + + +

From 566ffb244608258cb5916323b101e66ae712f82d Mon Sep 17 00:00:00 2001 From: luoyang Date: Wed, 26 Sep 2018 16:24:01 +0800 Subject: [PATCH 12/12] add modify sur --- .../dev/core/impl/ManualServiceimpl.java | 9 +++++++ .../core/impls/ClientManagerImpl.java | 7 ++++++ .../manage/task/PostponeClientTask.java | 10 +++++++- .../partner/templates/partner_new_rate.html | 24 ------------------- 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/ManualServiceimpl.java b/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/ManualServiceimpl.java index 501daac17..7f1236a4e 100644 --- a/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/ManualServiceimpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/ManualServiceimpl.java @@ -1,7 +1,9 @@ package au.com.royalpay.payment.manage.dev.core.impl; +import au.com.royalpay.payment.channels.rpay.runtime.RpayApi; import au.com.royalpay.payment.manage.dev.core.ManualService; import au.com.royalpay.payment.manage.mappers.system.ClientAccountMapper; +import au.com.royalpay.payment.manage.mappers.system.ClientMapper; import au.com.royalpay.payment.manage.mappers.system.ClientRateMapper; import au.com.royalpay.payment.manage.merchants.core.ClientModifySupport; import au.com.royalpay.payment.manage.merchants.entity.impls.SwitchPermissionModify; @@ -40,6 +42,10 @@ public class ManualServiceimpl implements ManualService { private SynchronizedScheduler synchronizedScheduler; @Resource private ClientModifySupport clientModifySupport; + @Resource + private RpayApi rpayApi; + @Resource + private ClientMapper clientMapper; @Override public void clientPostpone() { @@ -82,6 +88,9 @@ public class ManualServiceimpl implements ManualService { record.put("manager_name", "System"); record.put("remark", "费率到期系统自动延期1年"); clientRateMapper.saveRate(record); + if ("Rpay".equals(o.getString("rate_name"))) { + rpayApi.modifySurchargeConfig(clientMapper.findClient(client_id)); + } }); clientModifySupport.processClientConfigModify(new SwitchPermissionModify(null, p.getString("client_moniker"), "tax_in_surcharge", false)); 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 1785bb42e..6d9da4f29 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 @@ -84,6 +84,7 @@ import au.com.royalpay.payment.manage.support.sms.SmsSender; import au.com.royalpay.payment.manage.system.core.ClientContractService; import au.com.royalpay.payment.manage.system.core.MailGunService; import au.com.royalpay.payment.manage.tradelog.beans.TradeLogQuery; +import au.com.royalpay.payment.tools.CommonConsts; import au.com.royalpay.payment.tools.connections.attachment.core.AttachmentClient; import au.com.royalpay.payment.tools.connections.mpsupport.MpWechatApi; import au.com.royalpay.payment.tools.connections.mpsupport.MpWechatApiProvider; @@ -1610,6 +1611,8 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid configNewClientRate(config, clientId, "hf", "hf_rate_value", org, "min_hf_rate"); configNewClientRate(config, clientId, "Rpay", "Rpay_rate_value", org, "min_Rpay_rate"); + rpayApi.modifySurchargeConfig(client); + } private void configNewClientRate(JSONObject config, int clientId, String channel, String rateKey, JSONObject org, String rateValueKey) { @@ -1651,6 +1654,9 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid configJson.put("manager_name", manager.getString("username")); configJson.put("update_time", new Date()); clientRateMapper.updateConfig(configJson); + if ("Rpay".equals(configJson.getString("rate_name"))) { + rpayApi.modifySurchargeConfig(client); + } int clientId = client.getIntValue("client_id"); JSONObject changeRate = merchantInfoProvider.clientCurrentRate(clientId, new Date(), "Wechat"); int cleanDays = changeRate.getIntValue("clean_days"); @@ -3195,6 +3201,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid throw new InvalidShortIdException(); } clientModifySupport.processClientConfigModify(new SwitchPermissionModify(account, clientMoniker, "skip_clearing", skip_clearing)); + rpayApi.switchMerchantSettle(client); } @Override diff --git a/src/main/java/au/com/royalpay/payment/manage/task/PostponeClientTask.java b/src/main/java/au/com/royalpay/payment/manage/task/PostponeClientTask.java index 18a98a6d7..9b76c96d6 100644 --- a/src/main/java/au/com/royalpay/payment/manage/task/PostponeClientTask.java +++ b/src/main/java/au/com/royalpay/payment/manage/task/PostponeClientTask.java @@ -1,6 +1,8 @@ package au.com.royalpay.payment.manage.task; +import au.com.royalpay.payment.channels.rpay.runtime.RpayApi; import au.com.royalpay.payment.manage.mappers.system.ClientAccountMapper; +import au.com.royalpay.payment.manage.mappers.system.ClientMapper; import au.com.royalpay.payment.manage.mappers.system.ClientRateMapper; import au.com.royalpay.payment.manage.mappers.system.ManagerMapper; import au.com.royalpay.payment.manage.merchants.core.ClientManager; @@ -52,6 +54,10 @@ public class PostponeClientTask { private SynchronizedScheduler synchronizedScheduler; @Resource private ClientModifySupport clientModifySupport; + @Resource + private RpayApi rpayApi; + @Resource + private ClientMapper clientMapper; @Scheduled(cron = "0 30 8 * * ?") public void postponeClient() { @@ -93,7 +99,9 @@ public class PostponeClientTask { record.put("manager_name", "System"); record.put("remark", "费率到期系统自动延期1年"); clientRateMapper.saveRate(record); - + if ("Rpay".equals(o.getString("rate_name"))) { + rpayApi.modifySurchargeConfig(clientMapper.findClient(client_id)); + } }); clientModifySupport.processClientConfigModify(new SwitchPermissionModify(null, p.getString("client_moniker"), "tax_in_surcharge", false)); adminAccounts.forEach(o -> { diff --git a/src/main/ui/static/payment/partner/templates/partner_new_rate.html b/src/main/ui/static/payment/partner/templates/partner_new_rate.html index 19267e23d..fe0aa512f 100644 --- a/src/main/ui/static/payment/partner/templates/partner_new_rate.html +++ b/src/main/ui/static/payment/partner/templates/partner_new_rate.html @@ -160,30 +160,6 @@ -
- -
-
- -
%
-
-
-
- No more than 2.2% -
-
- No less than 0.6% -
-
- Required Field -
-
- -
-
-
Nick Name Customer openId Amount(AUD)
+ + + {{customer.nickname}} + + + + {{customer.nickname}} + + + + {{customer.nickname}} + + + + {{customer.nickname}} +