From 5e4ce5d1ef390fe7dead1f35aac6fbd47fd3117d Mon Sep 17 00:00:00 2001 From: Todking Date: Tue, 14 Sep 2021 18:44:22 +0800 Subject: [PATCH] =?UTF-8?q?add=20=E6=96=B0=E5=A2=9Eaps=E5=95=86=E6=88=B7?= =?UTF-8?q?=E8=B4=B9=E7=8E=87=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../static/payment/partner/partner-manage.js | 90 +++++++++---------- .../partner_new_alipay_aps_rate.html | 23 ----- 2 files changed, 45 insertions(+), 68 deletions(-) diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js index 16dc34ae9..820f6b441 100644 --- a/src/main/ui/static/payment/partner/partner-manage.js +++ b/src/main/ui/static/payment/partner/partner-manage.js @@ -3740,27 +3740,27 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter $scope.errmsg = resp.data.message } ) - // $scope.changeDays = function () { - // if ($scope.rate.clean_days) { - // switch ($scope.rate.clean_days) { - // case '1': { - // $scope.rate.wechat_rate_value = parseFloat($scope.sysRateConfig.t1.Wechat) - // $scope.rate.transaction_fee = 0 - // break - // } - // case '2': { - // $scope.rate.wechat_rate_value = parseFloat($scope.sysRateConfig.t2.Wechat) - // $scope.rate.transaction_fee = 0 - // break - // } - // case '3': { - // $scope.rate.wechat_rate_value = parseFloat($scope.sysRateConfig.t3.Wechat) - // $scope.rate.transaction_fee = 0 - // break - // } - // } - // } - // } + } + $scope.changeDays = function () { + if ($scope.rate.clean_days) { + switch ($scope.rate.clean_days) { + case '1': { + $scope.rate.interchange_fee_value = parseFloat($scope.sysRateConfig.t1.InterchangeFee) + $scope.rate.service_fee_value = parseFloat($scope.sysRateConfig.t1.ServiceFee) + break + } + case '2': { + $scope.rate.interchange_fee_value = parseFloat($scope.sysRateConfig.t2.InterchangeFee) + $scope.rate.service_fee_value = parseFloat($scope.sysRateConfig.t2.ServiceFee) + break + } + case '3': { + $scope.rate.interchange_fee_value = parseFloat($scope.sysRateConfig.t3.InterchangeFee) + $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) { - 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) { - 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', 'commonDialog', '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.online=online; + $scope.subMerchantInfo.online = online; $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.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.business_type_offline = true; // } - if($scope.subMerchantInfo.online) { + if ($scope.subMerchantInfo.online) { $scope.title = "AlipayPlus-aps(Online)Registration"; - }else{ + } else { $scope.title = "AlipayPlus-aps(Retail)Registration"; } $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.registrationType='OTHER_IDENTIFICATION_NO' + $scope.subMerchantInfo.registrationType = 'OTHER_IDENTIFICATION_NO' if ($scope.subMerchantInfo.business_structure) { $scope.subMerchantInfo.businessType = $scope.subMerchantInfo.business_structure != 'Registered body(Sole Trader)' ? 'ENTERPRISE' : 'INDIVIDUAL' } - $scope.subMerchantInfo.shareholderName= $scope.subMerchantInfo.representativeInfo.representative_person; - $scope.subMerchantInfo.representativeName= $scope.subMerchantInfo.representativeInfo.representative_person; - $scope.subMerchantInfo.storeAddress= $scope.subMerchantInfo.address; - $scope.subMerchantInfo.registrationNo= $scope. subMerchantInfo.acn ? $scope.subMerchantInfo.acn : $scope.subMerchantInfo.abn; - $scope.subMerchantInfo.storeMCC=$scope.subMerchantInfo.alipayindustry; - $scope.subMerchantInfo.storeName=$scope.subMerchantInfo.store_name; + $scope.subMerchantInfo.shareholderName = $scope.subMerchantInfo.representativeInfo.representative_person; + $scope.subMerchantInfo.representativeName = $scope.subMerchantInfo.representativeInfo.representative_person; + $scope.subMerchantInfo.storeAddress = $scope.subMerchantInfo.address; + $scope.subMerchantInfo.registrationNo = $scope.subMerchantInfo.acn ? $scope.subMerchantInfo.acn : $scope.subMerchantInfo.abn; + $scope.subMerchantInfo.storeMCC = $scope.subMerchantInfo.alipayindustry; + $scope.subMerchantInfo.storeName = $scope.subMerchantInfo.store_name; $scope.alipayMccCategory = {} $scope.loadAlipayCategory = function () { @@ -7442,22 +7442,22 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter storeAddress: $scope.subMerchantInfo.storeAddress, registrationAddress: $scope.subMerchantInfo.registrationAddress, } - params.productCodes=[]; - if($scope.subMerchantInfo.online){ + params.productCodes = []; + if ($scope.subMerchantInfo.online) { params.productCodes.push('CASHIER_PAYMENT'); - }else{ + } else { params.productCodes.push('IN_STORE_PAYMENT'); } - params.websites=[] - if($scope.subMerchantInfo.online){ + params.websites = [] + if ($scope.subMerchantInfo.online) { params.websites.push($scope.subMerchantInfo.website); } $http.post('/sys/partners/' + $scope.subMerchantInfo.client_moniker + '/apply_alipayplus', params).then( function (resp) { - if(resp.data.success) { - commonDialog.alert({ title: 'Success', content: "注册成功!", type: 'success' }) - }else{ + if (resp.data.success) { + commonDialog.alert({title: 'Success', content: "注册成功!", type: 'success'}) + } else { commonDialog.alert({title: 'Error', content: "注册失败！", type: 'error'}) } @@ -7465,7 +7465,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter }, function (resp) { $scope.flag = false - commonDialog.alert({ title: 'Error', content: resp.data.message, type: 'error' }) + commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}) } ) diff --git a/src/main/ui/static/payment/partner/templates/partner_new_alipay_aps_rate.html b/src/main/ui/static/payment/partner/templates/partner_new_alipay_aps_rate.html index f8526d2cf..7842aaecd 100644 --- a/src/main/ui/static/payment/partner/templates/partner_new_alipay_aps_rate.html +++ b/src/main/ui/static/payment/partner/templates/partner_new_alipay_aps_rate.html @@ -69,29 +69,6 @@ - - - - - - - - - - - - - - - - - - - - - - -