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

add 新增aps商户费率配置

Browse Source
master
Todking 3 years ago
parent d68c514376
commit 5e4ce5d1ef
2 changed files with 45 additions and 68 deletions
Show Stats Download Patch File Download Diff File

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

@ -3740,27 +3740,27 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
$scope.errmsg = resp.data.message $scope.errmsg = resp.data.message
} }
) )
// $scope.changeDays = function () { }
// if ($scope.rate.clean_days) { $scope.changeDays = function () {
// switch ($scope.rate.clean_days) { if ($scope.rate.clean_days) {
// case '1': { switch ($scope.rate.clean_days) {
// $scope.rate.wechat_rate_value = parseFloat($scope.sysRateConfig.t1.Wechat) case '1': {
// $scope.rate.transaction_fee = 0 $scope.rate.interchange_fee_value = parseFloat($scope.sysRateConfig.t1.InterchangeFee)
// break $scope.rate.service_fee_value = parseFloat($scope.sysRateConfig.t1.ServiceFee)
// } break
// case '2': { }
// $scope.rate.wechat_rate_value = parseFloat($scope.sysRateConfig.t2.Wechat) case '2': {
// $scope.rate.transaction_fee = 0 $scope.rate.interchange_fee_value = parseFloat($scope.sysRateConfig.t2.InterchangeFee)
// break $scope.rate.service_fee_value = parseFloat($scope.sysRateConfig.t2.ServiceFee)
// } break
// case '3': { }
// $scope.rate.wechat_rate_value = parseFloat($scope.sysRateConfig.t3.Wechat) case '3': {
// $scope.rate.transaction_fee = 0 $scope.rate.interchange_fee_value = parseFloat($scope.sysRateConfig.t3.InterchangeFee)
// break $scope.rate.service_fee_value = parseFloat($scope.sysRateConfig.t3.ServiceFee)
// } break
// } }
// } }
// } }
} }
} }
]) ])
@ -6554,7 +6554,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
}) })
}, },
function (resp) { function (resp) {
commonDialog.alert({ title: 'Error', content: '查询失败：' + resp.data.message, type: 'error' }) commonDialog.alert({title: 'Error', content: '查询失败：' + resp.data.message, type: 'error'})
} }
) )
}; };
@ -6568,7 +6568,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
}) })
}, },
function (resp) { function (resp) {
commonDialog.alert({ title: 'Error', content: '查询失败：' + resp.data.message, type: 'error' }) commonDialog.alert({title: 'Error', content: '查询失败：' + resp.data.message, type: 'error'})
} }
) )
}; };
@ -7361,11 +7361,11 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
'$filter', '$filter',
'commonDialog', 'commonDialog',
'online', 'online',
function ($scope, $http, $uibModal, $state, subMerchantInfo, $filter, commonDialog,online) { function ($scope, $http, $uibModal, $state, subMerchantInfo, $filter, commonDialog, online) {
$scope.subMerchantInfo = angular.copy(subMerchantInfo) $scope.subMerchantInfo = angular.copy(subMerchantInfo)
$scope.subMerchantInfo.online=online; $scope.subMerchantInfo.online = online;
$scope.subMerchantInfo.merchantDisplayName = $scope.subMerchantInfo.short_name; $scope.subMerchantInfo.merchantDisplayName = $scope.subMerchantInfo.short_name;
$scope.subMerchantInfo.registrationAddress= $scope.subMerchantInfo.address; $scope.subMerchantInfo.registrationAddress = $scope.subMerchantInfo.address;
// if ($scope.subMerchantInfo.client_pay_type) { // if ($scope.subMerchantInfo.client_pay_type) {
// if ($scope.subMerchantInfo.client_pay_type.indexOf('1') >= 0 && $scope.subMerchantInfo.client_pay_type.indexOf('2') >= 0) { // if ($scope.subMerchantInfo.client_pay_type.indexOf('1') >= 0 && $scope.subMerchantInfo.client_pay_type.indexOf('2') >= 0) {
@ -7380,24 +7380,24 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
// $scope.subMerchantInfo.payment_type_online = true; // $scope.subMerchantInfo.payment_type_online = true;
// $scope.subMerchantInfo.business_type_offline = true; // $scope.subMerchantInfo.business_type_offline = true;
// } // }
if($scope.subMerchantInfo.online) { if ($scope.subMerchantInfo.online) {
$scope.title = "AlipayPlus-aps(Online)Registration"; $scope.title = "AlipayPlus-aps(Online)Registration";
}else{ } else {
$scope.title = "AlipayPlus-aps(Retail)Registration"; $scope.title = "AlipayPlus-aps(Retail)Registration";
} }
$scope.subMerchantInfo.websiteType = 'WEB'; $scope.subMerchantInfo.websiteType = 'WEB';
$scope.subMerchantInfo.website= $scope.subMerchantInfo.company_website; $scope.subMerchantInfo.website = $scope.subMerchantInfo.company_website;
$scope.subMerchantInfo.legalName = $scope.subMerchantInfo.company_name; $scope.subMerchantInfo.legalName = $scope.subMerchantInfo.company_name;
$scope.subMerchantInfo.registrationType='OTHER_IDENTIFICATION_NO' $scope.subMerchantInfo.registrationType = 'OTHER_IDENTIFICATION_NO'
if ($scope.subMerchantInfo.business_structure) { if ($scope.subMerchantInfo.business_structure) {
$scope.subMerchantInfo.businessType = $scope.subMerchantInfo.business_structure != 'Registered body(Sole Trader)' ? 'ENTERPRISE' : 'INDIVIDUAL' $scope.subMerchantInfo.businessType = $scope.subMerchantInfo.business_structure != 'Registered body(Sole Trader)' ? 'ENTERPRISE' : 'INDIVIDUAL'
} }
$scope.subMerchantInfo.shareholderName= $scope.subMerchantInfo.representativeInfo.representative_person; $scope.subMerchantInfo.shareholderName = $scope.subMerchantInfo.representativeInfo.representative_person;
$scope.subMerchantInfo.representativeName= $scope.subMerchantInfo.representativeInfo.representative_person; $scope.subMerchantInfo.representativeName = $scope.subMerchantInfo.representativeInfo.representative_person;
$scope.subMerchantInfo.storeAddress= $scope.subMerchantInfo.address; $scope.subMerchantInfo.storeAddress = $scope.subMerchantInfo.address;
$scope.subMerchantInfo.registrationNo= $scope. subMerchantInfo.acn ? $scope.subMerchantInfo.acn : $scope.subMerchantInfo.abn; $scope.subMerchantInfo.registrationNo = $scope.subMerchantInfo.acn ? $scope.subMerchantInfo.acn : $scope.subMerchantInfo.abn;
$scope.subMerchantInfo.storeMCC=$scope.subMerchantInfo.alipayindustry; $scope.subMerchantInfo.storeMCC = $scope.subMerchantInfo.alipayindustry;
$scope.subMerchantInfo.storeName=$scope.subMerchantInfo.store_name; $scope.subMerchantInfo.storeName = $scope.subMerchantInfo.store_name;
$scope.alipayMccCategory = {} $scope.alipayMccCategory = {}
$scope.loadAlipayCategory = function () { $scope.loadAlipayCategory = function () {
@ -7442,22 +7442,22 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
storeAddress: $scope.subMerchantInfo.storeAddress, storeAddress: $scope.subMerchantInfo.storeAddress,
registrationAddress: $scope.subMerchantInfo.registrationAddress, registrationAddress: $scope.subMerchantInfo.registrationAddress,
} }
params.productCodes=[]; params.productCodes = [];
if($scope.subMerchantInfo.online){ if ($scope.subMerchantInfo.online) {
params.productCodes.push('CASHIER_PAYMENT'); params.productCodes.push('CASHIER_PAYMENT');
}else{ } else {
params.productCodes.push('IN_STORE_PAYMENT'); params.productCodes.push('IN_STORE_PAYMENT');
} }
params.websites=[] params.websites = []
if($scope.subMerchantInfo.online){ if ($scope.subMerchantInfo.online) {
params.websites.push($scope.subMerchantInfo.website); params.websites.push($scope.subMerchantInfo.website);
} }
$http.post('/sys/partners/' + $scope.subMerchantInfo.client_moniker + '/apply_alipayplus', params).then( $http.post('/sys/partners/' + $scope.subMerchantInfo.client_moniker + '/apply_alipayplus', params).then(
function (resp) { function (resp) {
if(resp.data.success) { if (resp.data.success) {
commonDialog.alert({ title: 'Success', content: "注册成功!", type: 'success' }) commonDialog.alert({title: 'Success', content: "注册成功!", type: 'success'})
}else{ } else {
commonDialog.alert({title: 'Error', content: "注册失败！", type: 'error'}) commonDialog.alert({title: 'Error', content: "注册失败！", type: 'error'})
} }
@ -7465,7 +7465,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
}, },
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'})
} }
) )

23
src/main/ui/static/payment/partner/templates/partner_new_alipay_aps_rate.html
Unescape View File

@ -69,29 +69,6 @@
</div> </div>
</div> </div>
<!-- 新增transaction_fee -->
<!-- <div class="form-group"-->
<!-- ng-class="{'has-error':rate_form.transaction_fee.$invalid && rate_form.transaction_fee.$dirty}">-->
<!-- <label class="control-label col-sm-4" for="transaction_fee_input">Transaction Fee</label>-->
<!-- <div class="col-sm-6">-->
<!-- <div class="input-group">-->
<!-- <input type="number" name="Transaction_fee_value" stringToNumber2 class="form-control" ng-model="rate.transaction_fee"-->
<!-- min="0" step="0.1" max="1" id="transaction_fee_input" required>-->
<!-- <div class="input-group-addon">$</div>-->
<!-- </div>-->
<!-- <div ng-messages="rate_form.transaction_fee.$error" ng-if="rate_form.transaction_fee.$dirty">-->
<!-- <div class="small text-danger" ng-message="min">-->
<!-- <i class="glyphicon glyphicon-alert"></i> No less than 0-->
<!-- </div>-->
<!-- <div class="small text-danger" ng-message="required">-->
<!-- <i class="glyphicon glyphicon-alert"></i> Required Field-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<div class="form-group"> <div class="form-group">
<label class="control-label col-sm-4" for="active_time_input">Active Date</label> <label class="control-label col-sm-4" for="active_time_input">Active Date</label>
<div class="col-sm-6"> <div class="col-sm-6">

Write Preview
Loading…
Cancel
Save