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

🐞fix(royalpay): 修复微信子商户id失效

Browse Source
master
xiao.tang 4 years ago
parent a1d914418e
commit 551d00ef6b
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File

6
src/main/ui/static/payment/partner/partner-manage.js
Unescape View File

@ -5700,21 +5700,21 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
$scope.confirm = function () { $scope.confirm = function () {
$scope.flag = true $scope.flag = true
if (channel === 'Wechat') { if (channel === 'Wechat') {
$http.put('/sys/partners/' + clientMoniker + '/payment_config', { sub_merchant_id: merchantId }).then(function (resp) { $http.put('/sys/partners/' + clientMoniker + '/payment_config', { sub_merchant_id: $scope.merchantId }).then(function (resp) {
$scope.$close(); $scope.$close();
}, function (resp) { }, function (resp) {
$scope.flag = false $scope.flag = false
commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' }) commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' })
}); });
} else if (channel === 'Alipay') { } else if (channel === 'Alipay') {
$http.put('/sys/partners/' + clientMoniker + '/ali_sub_merchant_id', { ali_sub_merchant_id: merchantId }).then(function (resp) { $http.put('/sys/partners/' + clientMoniker + '/ali_sub_merchant_id', { ali_sub_merchant_id: $scope.merchantId }).then(function (resp) {
$scope.$close(); $scope.$close();
}, function (resp) { }, function (resp) {
$scope.flag = false $scope.flag = false
commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' }) commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' })
}); });
} else if (channel = 'AlipayOnline') { } else if (channel = 'AlipayOnline') {
$http.put('/sys/partners/' + clientMoniker + '/ali_sub_merchant_id', { ali_sub_merchant_id: merchantId }).then(function (resp) { $http.put('/sys/partners/' + clientMoniker + '/ali_sub_merchant_id', { ali_sub_merchant_id: $scope.merchantId }).then(function (resp) {
$scope.$close(); $scope.$close();
}, function (resp) { }, function (resp) {
$scope.flag = false $scope.flag = false

14
src/main/ui/static/payment/partner/templates/sub_merchant_id_apply.html
Unescape View File

@ -87,12 +87,11 @@
<div> <div>
<button role="button" class="btn btn-info" title="Apply Sub Merchant Id" <button role="button" class="btn btn-info" title="Apply Sub Merchant Id"
ng-click="applyWxSubMerchantId()"> ng-click="applyWxSubMerchantId()">
<i class="fa fa-plus"></i> <i class="fa fa-plus"></i> Apply
Apply
</button> </button>
<button role="button" class="btn btn-info" <button role="button" class="btn btn-info"
ng-click="queryWechatSubMerchantIdStatus()"> ng-click="queryWechatSubMerchantIdStatus()">
<i class="fa fa-search"></i>Result <i class="fa fa-search"></i> Result
</button> </button>
<button role="button" class="btn btn-info" title="modify Sub Merchant Id" disabled> <button role="button" class="btn btn-info" title="modify Sub Merchant Id" disabled>
Modify Modify
@ -225,10 +224,10 @@
<div> <div>
<button role="button" class="btn btn-info" title="Apply Sub Merchant Id" <button role="button" class="btn btn-info" title="Apply Sub Merchant Id"
ng-click="submitAlipaySubId()"> ng-click="submitAlipaySubId()">
<i class="fa fa-plus"></i>Apply <i class="fa fa-plus"></i> Apply
</button> </button>
<button role="button" class="btn btn-info" ng-click="queryAlipayGms()"> <button role="button" class="btn btn-info" ng-click="queryAlipayGms()">
<i class="fa fa-search"></i>Result <i class="fa fa-search"></i> Result
</button> </button>
<button role="button" class="btn btn-info" title="modify Sub Merchant Id" disabled> <button role="button" class="btn btn-info" title="modify Sub Merchant Id" disabled>
Modify Modify
@ -285,11 +284,10 @@
<button role="button" class="btn btn-info" title="Apply Sub Merchant Id" <button role="button" class="btn btn-info" title="Apply Sub Merchant Id"
ng-click="submitAlipayOnlineSubId()"> ng-click="submitAlipayOnlineSubId()">
<i class="fa fa-plus"></i> <i class="fa fa-plus"></i> Apply
Apply
</button> </button>
<button role="button" class="btn btn-info" ng-click="queryAlipayOnlineGms()"> <button role="button" class="btn btn-info" ng-click="queryAlipayOnlineGms()">
<i class="fa fa-search"></i>Result <i class="fa fa-search"></i> Result
</button> </button>
<button role="button" class="btn btn-info" title="modify Sub Merchant Id" disabled> <button role="button" class="btn btn-info" title="modify Sub Merchant Id" disabled>
Modify Modify

Write Preview
Loading…
Cancel
Save