From c6b7a5d2d4e4dcdc65b25c182da60d7f9d80460b Mon Sep 17 00:00:00 2001 From: yixian Date: Sat, 7 Apr 2018 21:45:34 +0800 Subject: [PATCH 1/5] error processing --- .../templates/payment/v1/gateway_jsapi.js | 13 +++++-- .../ui/static/templates/payment/v1/payment.js | 19 +++++++--- .../templates/payment/v1/retail_jsapi.js | 36 ++++++++++++++----- 3 files changed, 51 insertions(+), 17 deletions(-) diff --git a/src/main/ui/static/templates/payment/v1/gateway_jsapi.js b/src/main/ui/static/templates/payment/v1/gateway_jsapi.js index fc837d49c..119411cd9 100644 --- a/src/main/ui/static/templates/payment/v1/gateway_jsapi.js +++ b/src/main/ui/static/templates/payment/v1/gateway_jsapi.js @@ -50,9 +50,16 @@ $(document).ready(function () { invokePay(paydata); }, error: function (jqXhr) { - alert(jqXhr.responseJSON.message); - $('#wdiv').hide(); - dataCache.paying = false; + var respText = jqXhr.responseText; + try { + alert(JSON.parse(respText).message); + $('#wdiv').hide(); + dataCache.paying = false; + } catch (e) { + alert("Unexpected Error:" + respText); + $('#wdiv').hide(); + dataCache.paying = false; + } } }); diff --git a/src/main/ui/static/templates/payment/v1/payment.js b/src/main/ui/static/templates/payment/v1/payment.js index 60ee79934..cbc8f374b 100644 --- a/src/main/ui/static/templates/payment/v1/payment.js +++ b/src/main/ui/static/templates/payment/v1/payment.js @@ -198,7 +198,7 @@ $(function () { $('

').html('Surcharge 手续费(' + window.rateValue + '%):+' + currencySymbol + dataCache.surcharge).appendTo(bd); } if (parseFloat(dataCache.tax) > 0) { - $('

').html('GST(10%):'+currencySymbol+dataCache.tax).appendTo(bd); + $('

').html('GST(10%):' + currencySymbol + dataCache.tax).appendTo(bd); } $(dataCache.discounts).each(function () { $('

').html(this.title + ':-' + currencySymbol + this.amount).appendTo(bd); @@ -287,10 +287,19 @@ $(function () { }) }, error: function (jqXhr) { - weuiAlert(jqXhr.responseJSON.message); - $('#key_P').removeClass('hidden'); - $('#key_Loading').addClass('hidden'); - dataCache.paying = false; + var respText = jqXhr.responseText; + try { + weuiAlert(JSON.parse(respText).message); + $('#key_P').removeClass('hidden'); + $('#key_Loading').addClass('hidden'); + dataCache.paying = false; + } catch (e) { + alert("Unexpected Error:" + respText); + $('#key_P').removeClass('hidden'); + $('#key_Loading').addClass('hidden'); + dataCache.paying = false; + } + } }) }); diff --git a/src/main/ui/static/templates/payment/v1/retail_jsapi.js b/src/main/ui/static/templates/payment/v1/retail_jsapi.js index 6c42a8d43..d31f1e94b 100644 --- a/src/main/ui/static/templates/payment/v1/retail_jsapi.js +++ b/src/main/ui/static/templates/payment/v1/retail_jsapi.js @@ -4,18 +4,21 @@ $(document).ready(function () { 'use strict'; decode(); + function decode() { var redirect = window.redirect; - while(redirect.indexOf('://')<0){ + while (redirect.indexOf('://') < 0) { redirect = decodeURIComponent(redirect); - if(redirect==window.redirect){ + if (redirect == window.redirect) { break; } window.redirect = redirect; } } + var dataCache = {paying: false}; $('#key_P').bind('touchstart', startPay); + function startPay() { $('#wdiv').show(); if (dataCache.paying) { @@ -28,17 +31,31 @@ $(document).ready(function () { method: 'get', dataType: 'json', success: function (pay) { - if(pay.direct_paid){ + try { + if (pay.direct_paid) { + dataCache.paying = false; + location.href = window.redirect; + } + var paydata = pay.jsapi; + invokePay(paydata); + }catch (e) { + alert("Unexpected Error:" + e); + $('#wdiv').hide(); dataCache.paying = false; - location.href = window.redirect; } - var paydata = pay.jsapi; - invokePay(paydata); }, error: function (jqXhr) { - alert(jqXhr.responseJSON.message); - $('#wdiv').hide(); - dataCache.paying = false; + var respText = jqXhr.responseText; + try { + alert(JSON.parse(respText).message); + $('#wdiv').hide(); + dataCache.paying = false; + } catch (e) { + alert("Unexpected Error:" + respText); + $('#wdiv').hide(); + dataCache.paying = false; + } + } }); @@ -85,6 +102,7 @@ $(document).ready(function () { } }) } + checkOrderStd(); } }); \ No newline at end of file From 9e788f0581ba4e529c752a12dad7fa9e6b057933 Mon Sep 17 00:00:00 2001 From: wangning <164851225@qq.com> Date: Sun, 8 Apr 2018 11:13:53 +0800 Subject: [PATCH 2/5] contract add query param --- .../mappers/system/ClientsContractMapper.java | 2 +- .../system/core/ClientContractService.java | 2 +- .../core/impl/ClientContractServiceImpl.java | 4 ++-- .../manage/system/web/contractController.java | 6 ++++-- .../mappers/system/ClientsContractMapper.xml | 6 +++++- src/main/ui/static/sys/contract.js | 6 ++++-- .../static/sys/templates/contract_sign.html | 20 +++++++++++++++++-- 7 files changed, 35 insertions(+), 11 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientsContractMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientsContractMapper.java index b143de628..1b1f105ac 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientsContractMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientsContractMapper.java @@ -28,7 +28,7 @@ public interface ClientsContractMapper { @AutoSql(type = SqlType.SELECT) List list(); - PageList listWithClientInfo(PageBounds pagination); + PageList listWithClientInfo(JSONObject param,PageBounds pagination); List analysisSingstatus(); } diff --git a/src/main/java/au/com/royalpay/payment/manage/system/core/ClientContractService.java b/src/main/java/au/com/royalpay/payment/manage/system/core/ClientContractService.java index e9ea8072c..2511eb40c 100644 --- a/src/main/java/au/com/royalpay/payment/manage/system/core/ClientContractService.java +++ b/src/main/java/au/com/royalpay/payment/manage/system/core/ClientContractService.java @@ -17,7 +17,7 @@ public interface ClientContractService { void saveContract(int client_id, Date expire_date, String channel); - JSONObject list(PageBounds pagination); + JSONObject list(JSONObject param,PageBounds pagination); JSONObject analysis(); } diff --git a/src/main/java/au/com/royalpay/payment/manage/system/core/impl/ClientContractServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/system/core/impl/ClientContractServiceImpl.java index 5d6d6c470..40f83d625 100644 --- a/src/main/java/au/com/royalpay/payment/manage/system/core/impl/ClientContractServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/system/core/impl/ClientContractServiceImpl.java @@ -152,8 +152,8 @@ public class ClientContractServiceImpl implements ClientContractService { } @Override - public JSONObject list(PageBounds pagination) { - return PageListUtils.buildPageListResult(clientsContractMapper.listWithClientInfo(pagination)); + public JSONObject list(JSONObject param,PageBounds pagination) { + return PageListUtils.buildPageListResult(clientsContractMapper.listWithClientInfo(param,pagination)); } @Override diff --git a/src/main/java/au/com/royalpay/payment/manage/system/web/contractController.java b/src/main/java/au/com/royalpay/payment/manage/system/web/contractController.java index 631d910cd..61f5e931f 100644 --- a/src/main/java/au/com/royalpay/payment/manage/system/web/contractController.java +++ b/src/main/java/au/com/royalpay/payment/manage/system/web/contractController.java @@ -25,8 +25,10 @@ public class contractController { private ManualSettleSupport manualSettleSupport; @ManagerMapping(value = "/contract/list", method = RequestMethod.GET) - public JSONObject contractList(@RequestParam(value = "page", defaultValue = "1") int page, @RequestParam(value = "limit", defaultValue = "10") int limit) { - return clientContractService.list(new PageBounds(page,limit)); + public JSONObject contractList(@RequestParam(value = "page", defaultValue = "1") int page, @RequestParam(value = "limit", defaultValue = "10") int limit,@RequestParam(required = false) String client_moniker) { + JSONObject params = new JSONObject(); + params.put("client_moniker",client_moniker); + return clientContractService.list(params,new PageBounds(page,limit)); } @ManagerMapping(value = "/contract", method = RequestMethod.GET) diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientsContractMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientsContractMapper.xml index 2dc237318..3719df3ad 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientsContractMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientsContractMapper.xml @@ -11,7 +11,11 @@ select c.client_moniker client_moniker,cc.create_time create_time,cc.confirm_time confirm_time,a.display_name display_name from sys_clients_contract cc left join sys_clients c on c.client_id = cc.client_id left join sys_accounts a on a.account_id = cc.sign_account_id - + + + c.client_moniker = #{client_moniker} + + + + +
+ +
+ + + +
+
商户合同情况 （查看合同数：{{analysis.has_sign + analysis.not_sign}}，已同意：{{analysis.has_sign}})
From 4f780978dd8023652ec78367ed84461bc6e44e7d Mon Sep 17 00:00:00 2001 From: wangning <164851225@qq.com> Date: Sun, 8 Apr 2018 11:14:11 +0800 Subject: [PATCH 3/5] update --- src/main/ui/static/sys/contract.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/ui/static/sys/contract.js b/src/main/ui/static/sys/contract.js index d87aa2b99..805522d1b 100644 --- a/src/main/ui/static/sys/contract.js +++ b/src/main/ui/static/sys/contract.js @@ -24,7 +24,6 @@ define(['angular'], function (angular) { $scope.params = {}; $scope.getContractAnalysis = function (page) { var params = angular.copy($scope.params); - alert(params.client_moniker); params.page = page || $scope.pagination.page || 1; $http.get('/manage/common/analysis/contract/list', {params: params}).then(function (resp) { $scope.contract = resp.data.data; From 4a9ea664071676fe80330c73fef12bdcb8a3db01 Mon Sep 17 00:00:00 2001 From: wangning <164851225@qq.com> Date: Sun, 8 Apr 2018 12:05:39 +0800 Subject: [PATCH 4/5] update doc --- src/document/cn/apis.js | 1 + src/document/en/apis.js | 1 + 2 files changed, 2 insertions(+) diff --git a/src/document/cn/apis.js b/src/document/cn/apis.js index 173fb90e3..6f111534e 100644 --- a/src/document/cn/apis.js +++ b/src/document/cn/apis.js @@ -681,6 +681,7 @@ * @apiDescription * 接入微信小程序需完成海外主体认证，并且认证主体需要与在RoyalPay开通的商户主体一致。具体如何认证请查看微信公众平台相关文档。 * 用于小程序中发起支付，创建订单后返回小程序支付所需参数，该接口现仅支持微信小程序。 + * 接入参考文档:https://www.royalpay.com.au/downloads/MiniProgram_WechatPay.pdf *
* * @apiVersion 1.0.0 diff --git a/src/document/en/apis.js b/src/document/en/apis.js index 829113701..3bc59577e 100644 --- a/src/document/en/apis.js +++ b/src/document/en/apis.js @@ -698,6 +698,7 @@ * @apiName microapp * @apiDescription Use for wechat Payment in miniprogram. After create order, returned and redirect param. + MiniProgram_WechatPay doc: https://www.royalpay.com.au/downloads/MiniProgram_WechatPay.pdf * wechat Channel Only.
*
* * @apiVersion 1.0.0 From 9c6f6db4bfaa2d40540f99a30a3377be7a4c8b08 Mon Sep 17 00:00:00 2001 From: wangning <164851225@qq.com> Date: Sun, 8 Apr 2018 13:51:52 +0800 Subject: [PATCH 5/5] update --- src/document/cn/apis.js | 2 +- src/document/en/apis.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/document/cn/apis.js b/src/document/cn/apis.js index 6f111534e..1937ecd41 100644 --- a/src/document/cn/apis.js +++ b/src/document/cn/apis.js @@ -681,7 +681,7 @@ * @apiDescription * 接入微信小程序需完成海外主体认证，并且认证主体需要与在RoyalPay开通的商户主体一致。具体如何认证请查看微信公众平台相关文档。 * 用于小程序中发起支付，创建订单后返回小程序支付所需参数，该接口现仅支持微信小程序。 - * 接入参考文档:https://www.royalpay.com.au/downloads/MiniProgram_WechatPay.pdf + * 接入参考文档 *
* * @apiVersion 1.0.0 diff --git a/src/document/en/apis.js b/src/document/en/apis.js index 3bc59577e..7ef5420fd 100644 --- a/src/document/en/apis.js +++ b/src/document/en/apis.js @@ -698,8 +698,8 @@ * @apiName microapp * @apiDescription Use for wechat Payment in miniprogram. After create order, returned and redirect param. - MiniProgram_WechatPay doc: https://www.royalpay.com.au/downloads/MiniProgram_WechatPay.pdf - * wechat Channel Only.
*
+ * wechat Channel Only.
*
+ * MiniProgram_WechatPay doc * * @apiVersion 1.0.0 * @apiGroup Miniprogram_Payment