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

Merge remote-tracking branch 'origin/alipayplus_aps' into alipayplus_aps

Browse Source
master
dalong306 3 years ago
parent c501f77d94 5ad8024c8d
commit d9583e03cb
5 changed files with 33 additions and 30 deletions
Show Stats Download Patch File Download Diff File

7
src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
Unescape View File

@ -2096,8 +2096,11 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
if (newConfig.getBigDecimal("cb_bankpay_rate_value") != null) { if (newConfig.getBigDecimal("cb_bankpay_rate_value") != null) {
clientRateMapper.saveRate(newConfig); clientRateMapper.saveRate(newConfig);
} }
} else if ("AlipayAps".equalsIgnoreCase(channel)) { } else if ("ApsInStore".equalsIgnoreCase(channel)) {
newConfig.put("transaction_fee", newConfig.getFloatValue("service_fee_value")); newConfig.put("transaction_fee", newConfig.getFloatValue("retail_service_fee_value"));
clientRateMapper.saveRate(newConfig);
} else if ("ApsCashier".equalsIgnoreCase(channel)) {
newConfig.put("transaction_fee", newConfig.getFloatValue("online_service_fee_value"));
clientRateMapper.saveRate(newConfig); clientRateMapper.saveRate(newConfig);
} else { } else {
clientRateMapper.saveRate(newConfig); clientRateMapper.saveRate(newConfig);

4
src/main/ui/static/config/organizations/templates/org_detail.html
Unescape View File

@ -182,7 +182,7 @@
<div ng-if="org.type == 0"> <div ng-if="org.type == 0">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading">China Wallet</div> <div class="panel-heading">China Wallets Rate</div>
<div class="panel-body"> <div class="panel-body">
<div class="col-sm-6" ng-if="org.commission_type == 1"> <div class="col-sm-6" ng-if="org.commission_type == 1">
<div class="form-group" <div class="form-group"
@ -523,7 +523,7 @@
</div> </div>
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading">A+ Rate</div> <div class="panel-heading">Alipay+ Rate</div>
<div class="panel-body"> <div class="panel-body">
<div class="col-sm-6" ng-if="org.commission_type == 1"> <div class="col-sm-6" ng-if="org.commission_type == 1">
<div class="form-group" <div class="form-group"

4
src/main/ui/static/config/organizations/templates/org_detail_parent.html
Unescape View File

@ -180,7 +180,7 @@
<div ng-if="org.type == 0"> <div ng-if="org.type == 0">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading">China Wallet</div> <div class="panel-heading">China Wallets Rate</div>
<div class="panel-body"> <div class="panel-body">
<div class="col-sm-6" ng-if="org.commission_type == 1"> <div class="col-sm-6" ng-if="org.commission_type == 1">
<div class="form-group" <div class="form-group"
@ -521,7 +521,7 @@
</div> </div>
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading">A+ Rate</div> <div class="panel-heading">Alipay+ Rate</div>
<div class="panel-body"> <div class="panel-body">
<div class="col-sm-6" ng-if="org.commission_type == 1"> <div class="col-sm-6" ng-if="org.commission_type == 1">
<div class="form-group" <div class="form-group"

40
src/main/ui/static/payment/partner/templates/partner_bankaccounts.html
Unescape View File

@ -235,8 +235,13 @@
</div> </div>
</div> </div>
<div class="panel panel-info"> <div class="panel panel-info">
<div class="panel-heading"> <div class="panel-heading" style="display: flex;justify-content: space-between">
<h3>China Wallet</h3> <h3>China Wallets Rate</h3>
<a id="addRate" class="btn btn-info" style="margin-bottom: 10px;margin-top: 20px" type="button"
ng-if="partner.rate_editable && (('11'|withRole)||((!partner.approve_result||partner.approve_result>4) && ('111'|withRole)))"
ng-click="newRate()">
Add Rate
</a>
</div> </div>
<div class="panel-body"> <div class="panel-body">
<div class="row"> <div class="row">
@ -266,11 +271,6 @@
ng-click="bankCtrl.rate_name='CB_BankPay'" ng-click="bankCtrl.rate_name='CB_BankPay'"
ng-if="sysconfig.active_channels.indexOf('CB_BankPay')!=-1">CB_BankPay</a> ng-if="sysconfig.active_channels.indexOf('CB_BankPay')!=-1">CB_BankPay</a>
</li> </li>
<a id="addRate" class="btn btn-info" style="float: right;margin-right: 10px" type="button"
ng-if="partner.rate_editable && (('11'|withRole)||((!partner.approve_result||partner.approve_result>4) && ('111'|withRole)))"
ng-click="newRate()">
Add Rate
</a>
</ul> </ul>
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-bordered"> <table class="table table-bordered">
@ -385,8 +385,13 @@
</div> </div>
<!-- card payment --> <!-- card payment -->
<div class="panel-heading"> <div class="panel-heading" style="display: flex;justify-content: space-between">
<h3>Card Payment Rate</h3> <h3>Card Payment Rate</h3>
<a id="addCardPaymentRate" class="btn btn-info" style="margin-top: 20px;margin-bottom: 10px" type="button"
ng-click="newCardPaymentRates()"
ng-if="((partner.card_rate_editable && ('100'|withRole)) || ('11'|withRole))">
Add Card Payment Rates
</a>
</div> </div>
<div class="panel-body"> <div class="panel-body">
<div class="row"> <div class="row">
@ -398,11 +403,6 @@
<!-- <li role="presentation" ng-class="{active:bankCtrl.rate_name=='rpaypmt_dd'}"><a role="button"--> <!-- <li role="presentation" ng-class="{active:bankCtrl.rate_name=='rpaypmt_dd'}"><a role="button"-->
<!-- ng-click="bankCtrl.rate_name='rpaypmt_dd'">Direct--> <!-- ng-click="bankCtrl.rate_name='rpaypmt_dd'">Direct-->
<!-- Debit</a></li>--> <!-- Debit</a></li>-->
<a id="addCardPaymentRate" class="btn btn-info" style="float: right" type="button"
ng-click="newCardPaymentRates()"
ng-if="((partner.card_rate_editable && ('100'|withRole)) || ('11'|withRole))">
Add Card Payment Rates
</a>
</ul> </ul>
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-bordered"> <table class="table table-bordered">
@ -453,8 +453,13 @@
</div> </div>
<!-- APS --> <!-- APS -->
<div class="panel-heading"> <div class="panel-heading" style="display: flex;justify-content: space-between">
<h3>A+</h3> <h3>Alipay+ Rate</h3>
<a id="addAlipayApsInStoreRate" class="btn btn-info" style="margin-bottom: 10px;margin-top: 20px"
type="button"
ng-click="newAlipayApsRate(apsBankCtrl.rate_name)">
Add A+(APS) Rate
</a>
</div> </div>
<div class="panel-body"> <div class="panel-body">
<div class="row"> <div class="row">
@ -468,11 +473,6 @@
role="button" role="button"
ng-click="apsBankCtrl.rate_name='ApsCashier'">A+(Online)</a> ng-click="apsBankCtrl.rate_name='ApsCashier'">A+(Online)</a>
</li> </li>
<a id="addAlipayApsInStoreRate" class="btn btn-info" style="float: right;margin-right: 10px"
type="button"
ng-click="newAlipayApsRate(apsBankCtrl.rate_name)">
Add A+(APS) Rate
</a>
</ul> </ul>
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-bordered"> <table class="table table-bordered">

8
src/main/ui/static/payment/partner/templates/rate_config_dialog.html
Unescape View File

@ -14,10 +14,10 @@
</div> </div>
<div class="form-group" <div class="form-group"
ng-class="{'has-error':rate_form.rate_value.$invalid && rate_form.rate_value.$dirty}"> ng-class="{'has-error':rate_form.rate_value.$invalid && rate_form.rate_value.$dirty}">
<label ng-if="rate.rate_name != 'AlipayAps'" class="control-label col-sm-4" for="rate_value_input"> <label ng-if="rate.rate_name != 'ApsInStore' && rate.rate_name != 'ApsCashier'" class="control-label col-sm-4" for="rate_value_input">
<span ng-if="rate.rate_name=='rpaypmt_card'">Domestic </span> <span ng-if="rate.rate_name=='rpaypmt_card'">Domestic </span>
Rate Value</label> Rate Value</label>
<label ng-if="rate.rate_name == 'AlipayAps'" class="control-label col-sm-4" for="rate_value_input"> <label ng-if="rate.rate_name == 'ApsCashier' || rate.rate_name == 'ApsInStore'" class="control-label col-sm-4" for="rate_value_input">
Interchange Fee</label> Interchange Fee</label>
<div class="col-sm-6"> <div class="col-sm-6">
<div class="input-group"> <div class="input-group">
@ -65,8 +65,8 @@
<!-- 新增transaction_fee字段 --> <!-- 新增transaction_fee字段 -->
<div class="form-group" <div class="form-group"
ng-class="{'has-error':rate_form.transaction_fee.$invalid && rate_form.transaction_fee.$dirty}"> ng-class="{'has-error':rate_form.transaction_fee.$invalid && rate_form.transaction_fee.$dirty}">
<label ng-if="rate.rate_name != 'AlipayAps'" class="control-label col-sm-4" for="transaction_fee_input">Transaction Fee</label> <label ng-if="rate.rate_name != 'ApsInStore' && rate.rate_name != 'ApsCashier'" class="control-label col-sm-4" for="transaction_fee_input">Transaction Fee</label>
<label ng-if="rate.rate_name == 'AlipayAps'" class="control-label col-sm-4" for="transaction_fee_input">Service Fee</label> <label ng-if="rate.rate_name == 'ApsInStore' || rate.rate_name == 'ApsCashier'" class="control-label col-sm-4" for="transaction_fee_input">Service Fee</label>
<div class="col-sm-6"> <div class="col-sm-6">
<div class="input-group"> <div class="input-group">
<input type="number" name="transaction_fee" class="form-control" <input type="number" name="transaction_fee" class="form-control"

Write Preview
Loading…
Cancel
Save