msb_52843
/
dalong_mall
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop

Browse Source
master
kira 6 years ago
parent 2683da65ca a2c55a6339
commit 076872abba
5 changed files with 66 additions and 9 deletions
Show Stats Download Patch File Download Diff File

21
src/main/ui/static/templates/alipay/v1/gateway_jsapi.js
Unescape View File

@ -88,7 +88,7 @@ $(document).ready(function () {
}, },
closeCurrentApp: false closeCurrentApp: false
}); });
location.href = window.redirect + (window.redirect.indexOf('?') < 0 ? '?' : '&') + 'success=true'; startCheckOrder(window.client_moniker, window.merchant_orderid);
} else { } else {
alert(res.memo); alert(res.memo);
if (window.tradeNo) { if (window.tradeNo) {
@ -103,6 +103,25 @@ $(document).ready(function () {
} }
} }
function startCheckOrder(clientMoniker, merchantOrderId) {
function checkOrderStd() {
$.ajax({
url: '/api/v1.0/payment/clients/' + clientMoniker + '/orders/' + merchantOrderId + '/status',
method: 'GET',
dataType: 'json',
success: function (res) {
if (res.paid) {
location.href = window.redirect + (window.redirect.indexOf('?') < 0 ? '?' : '&') + 'success=true';
} else {
setTimeout(checkOrderStd, 500);
}
}
})
}
checkOrderStd();
}
function waitForPaymentSuccess(orderId) { function waitForPaymentSuccess(orderId) {
var sock = new SockJS('/register'); var sock = new SockJS('/register');
var client = Stomp.over(sock); var client = Stomp.over(sock);

21
src/main/ui/static/templates/alipay/v1/payment.js
Unescape View File

@ -290,7 +290,7 @@ $(function () {
}, },
closeCurrentApp: false closeCurrentApp: false
}); });
location.href = '/api/v1.0/alipay/partners/' + window.client_moniker + '/orders/' + pay.order_id + '/result'; startCheckOrder(pay.order_id, '/api/v1.0/alipay/partners/' + window.client_moniker + '/orders/' + pay.order_id + '/result');
} else if (res.resultCode == '6001') { } else if (res.resultCode == '6001') {
//do nothing //do nothing
} else { } else {
@ -315,6 +315,25 @@ $(function () {
}) })
}); });
function startCheckOrder(orderId, url) {
function checkOrderStd() {
$.ajax({
url: '/api/v1.0/payment/orders/' + orderId + '/status',
method: 'GET',
dataType: 'json',
success: function (res) {
if (res.paid) {
location.href = url;
} else {
setTimeout(checkOrderStd, 500);
}
}
})
}
checkOrderStd();
}
function weuiAlert(msg) { function weuiAlert(msg) {
var config = { var config = {
template: msg template: msg

20
src/main/ui/static/templates/alipay/v1/retail_jsapi.js
Unescape View File

@ -54,7 +54,7 @@ $(document).ready(function () {
}, },
closeCurrentApp: false closeCurrentApp: false
}); });
location.href = window.redirect; startCheckOrder(window.order_id, window.redirect);
} else { } else {
alert(res.memo); alert(res.memo);
} }
@ -76,4 +76,22 @@ $(document).ready(function () {
} }
function startCheckOrder(orderId, url) {
function checkOrderStd() {
$.ajax({
url: '/api/v1.0/payment/orders/' + orderId + '/status',
method: 'GET',
dataType: 'json',
success: function (res) {
if (res.paid) {
location.href = url;
} else {
setTimeout(checkOrderStd, 500);
}
}
})
}
checkOrderStd();
}
}); });

6
src/main/ui/static/templates/payment/v1/payment.js
Unescape View File

@ -276,7 +276,7 @@ $(function () {
}, function (res) { }, function (res) {
dataCache.paying = false; dataCache.paying = false;
if (res.err_msg == 'get_brand_wcpay_request:ok') { if (res.err_msg == 'get_brand_wcpay_request:ok') {
startCheckOrder(pay.order_id); startCheckOrder(pay.order_id, '/api/payment/v1.0/wechat_jsapi_payment/partners/' + window.client_moniker + '/orders/' + pay.order_id);
} else { } else {
if (res.err_msg != 'get_brand_wcpay_request:cancel' && res.err_msg != 'get_brand_wcpay_request:fail') { if (res.err_msg != 'get_brand_wcpay_request:cancel' && res.err_msg != 'get_brand_wcpay_request:fail') {
@ -305,7 +305,7 @@ $(function () {
}) })
}); });
function startCheckOrder(orderId) { function startCheckOrder(orderId, url) {
function checkOrderStd() { function checkOrderStd() {
$.ajax({ $.ajax({
url: '/api/v1.0/payment/orders/' + orderId + '/status', url: '/api/v1.0/payment/orders/' + orderId + '/status',
@ -313,7 +313,7 @@ $(function () {
dataType: 'json', dataType: 'json',
success: function (res) { success: function (res) {
if (res.paid) { if (res.paid) {
location.href = '/api/payment/v1.0/wechat_jsapi_payment/partners/' + window.client_moniker + '/orders/' + orderId; location.href = url;
} else { } else {
setTimeout(checkOrderStd, 500); setTimeout(checkOrderStd, 500);
} }

7
src/main/ui/static/templates/payment/v1/retail_jsapi.js
Unescape View File

@ -73,7 +73,7 @@ $(document).ready(function () {
}, function (res) { }, function (res) {
dataCache.paying = false; dataCache.paying = false;
if (res.err_msg == 'get_brand_wcpay_request:ok') { if (res.err_msg == 'get_brand_wcpay_request:ok') {
startCheckOrder(window.order_id) startCheckOrder(window.order_id,window.redirect + (window.redirect.indexOf('?') < 0 ? '?' : '&') + 'success=true')
} else { } else {
if (res.err_msg != 'get_brand_wcpay_request:cancel' && res.err_msg != 'get_brand_wcpay_request:fail') { if (res.err_msg != 'get_brand_wcpay_request:cancel' && res.err_msg != 'get_brand_wcpay_request:fail') {
alert('WeChat Error:' + res.err_msg); alert('WeChat Error:' + res.err_msg);
@ -87,7 +87,8 @@ $(document).ready(function () {
}) })
} }
function startCheckOrder(orderId) {
function startCheckOrder(orderId, url) {
function checkOrderStd() { function checkOrderStd() {
$.ajax({ $.ajax({
url: '/api/v1.0/payment/orders/' + orderId + '/status', url: '/api/v1.0/payment/orders/' + orderId + '/status',
@ -95,7 +96,7 @@ $(document).ready(function () {
dataType: 'json', dataType: 'json',
success: function (res) { success: function (res) {
if (res.paid) { if (res.paid) {
location.href = window.redirect + (window.redirect.indexOf('?') < 0 ? '?' : '&') + 'success=true'; location.href = url;
} else { } else {
setTimeout(checkOrderStd, 500); setTimeout(checkOrderStd, 500);
} }

Write Preview
Loading…
Cancel
Save