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

upd:代理商卡支付拆分，商户信息去除杂牌渠道，cbbank非必填

Browse Source
master
dulingling 4 years ago
parent dea531757c
commit 9d58ae4838
7 changed files with 158 additions and 17 deletions
Show Stats Download Patch File Download Diff File

2
pom.xml
Unescape View File

@ -9,7 +9,7 @@
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>manage</artifactId> <artifactId>manage</artifactId>
<version>2.3.34</version> <version>2.3.35</version>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jib-maven-plugin.version>2.4.0</jib-maven-plugin.version> <jib-maven-plugin.version>2.4.0</jib-maven-plugin.version>

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

@ -1953,7 +1953,9 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
}}; }};
newConfig.put("ext_rates", extRateParams.toJSONString()); newConfig.put("ext_rates", extRateParams.toJSONString());
} }
if(newConfig.getBigDecimal("cb_bankpay_rate_value") != null){
clientRateMapper.saveRate(newConfig); clientRateMapper.saveRate(newConfig);
}
logger.info(clientId + "的" + channel + "费率设置成功"); logger.info(clientId + "的" + channel + "费率设置成功");
} }
} }

52
src/main/java/au/com/royalpay/payment/manage/organizations/beans/OrgInfo.java
Unescape View File

@ -28,7 +28,11 @@ public class OrgInfo {
private Double wechat_rate_value; private Double wechat_rate_value;
private Double alipayonline_rate_value; private Double alipayonline_rate_value;
private Double cb_bankpay_rate_value; private Double cb_bankpay_rate_value;
private Double rpaypmt_card_rate_value; // private Double rpaypmt_card_rate_value;
//卡支付-国内卡费率配置
private Double rpaypmt_domestic_card_rate_value;
//卡支付-国际卡费率配置
private Double rpaypmt_overseas_card_rate_value;
private Double rpaypmt_dd_rate_value; private Double rpaypmt_dd_rate_value;
private int is_valid; private int is_valid;
private String search_text; private String search_text;
@ -42,6 +46,8 @@ public class OrgInfo {
private Double min_alipayonline_rate; private Double min_alipayonline_rate;
private Double min_cb_bankpay_rate; private Double min_cb_bankpay_rate;
private Double min_rpaypmt_card_rate; private Double min_rpaypmt_card_rate;
private Double min_rpaypmt_domestic_card_rate;
private Double min_rpaypmt_overseas_card_rate;
private Double min_rpaypmt_dd_rate; private Double min_rpaypmt_dd_rate;
private String state; private String state;
private String senior_parent_org_id; private String senior_parent_org_id;
@ -292,17 +298,17 @@ public class OrgInfo {
this.min_cb_bankpay_rate = min_cb_bankpay_rate; this.min_cb_bankpay_rate = min_cb_bankpay_rate;
} }
public Double getRpaypmt_card_rate_value() {
return rpaypmt_card_rate_value;
}
public Double getRpaypmt_dd_rate_value() { public Double getRpaypmt_dd_rate_value() {
return rpaypmt_dd_rate_value; return rpaypmt_dd_rate_value;
} }
/* public Double getRpaypmt_card_rate_value() {
return rpaypmt_card_rate_value;
}
public void setRpaypmt_card_rate_value(Double rpaypmt_card_rate_value) { public void setRpaypmt_card_rate_value(Double rpaypmt_card_rate_value) {
this.rpaypmt_card_rate_value = rpaypmt_card_rate_value; this.rpaypmt_card_rate_value = rpaypmt_card_rate_value;
} }*/
public void setRpaypmt_dd_rate_value(Double rpaypmt_dd_rate_value) { public void setRpaypmt_dd_rate_value(Double rpaypmt_dd_rate_value) {
this.rpaypmt_dd_rate_value = rpaypmt_dd_rate_value; this.rpaypmt_dd_rate_value = rpaypmt_dd_rate_value;
@ -323,4 +329,38 @@ public class OrgInfo {
public void setMin_rpaypmt_dd_rate(Double min_rpaypmt_dd_rate) { public void setMin_rpaypmt_dd_rate(Double min_rpaypmt_dd_rate) {
this.min_rpaypmt_dd_rate = min_rpaypmt_dd_rate; this.min_rpaypmt_dd_rate = min_rpaypmt_dd_rate;
} }
public Double getRpaypmt_domestic_card_rate_value() {
return rpaypmt_domestic_card_rate_value;
}
public void setRpaypmt_domestic_card_rate_value(Double rpaypmt_domestic_card_rate_value) {
this.rpaypmt_domestic_card_rate_value = rpaypmt_domestic_card_rate_value;
}
public Double getRpaypmt_overseas_card_rate_value() {
return rpaypmt_overseas_card_rate_value;
}
public void setRpaypmt_overseas_card_rate_value(Double rpaypmt_overseas_card_rate_value) {
this.rpaypmt_overseas_card_rate_value = rpaypmt_overseas_card_rate_value;
}
public Double getMin_rpaypmt_domestic_card_rate() {
return min_rpaypmt_domestic_card_rate;
}
public void setMin_rpaypmt_domestic_card_rate(Double min_rpaypmt_domestic_card_rate) {
this.min_rpaypmt_domestic_card_rate = min_rpaypmt_domestic_card_rate;
}
public Double getMin_rpaypmt_overseas_card_rate() {
return min_rpaypmt_overseas_card_rate;
}
public void setMin_rpaypmt_overseas_card_rate(Double min_rpaypmt_overseas_card_rate) {
this.min_rpaypmt_overseas_card_rate = min_rpaypmt_overseas_card_rate;
}
} }

62
src/main/ui/static/config/organizations/templates/new_org.html
Unescape View File

@ -166,7 +166,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="form-group" <!-- <div class="form-group"
ng-class="{'has-error':org_form.rpaypmt_card_rate_value.$invalid && org_form.rpaypmt_card_rate_value.$dirty}"> ng-class="{'has-error':org_form.rpaypmt_card_rate_value.$invalid && org_form.rpaypmt_card_rate_value.$dirty}">
<label class="control-label col-sm-2" for="rpaypmt_card_rate_value_input">Card Payment Rate *</label> <label class="control-label col-sm-2" for="rpaypmt_card_rate_value_input">Card Payment Rate *</label>
<div class="col-sm-8"> <div class="col-sm-8">
@ -177,7 +177,36 @@
<span class="input-group-addon">%</span> <span class="input-group-addon">%</span>
</div> </div>
</div> </div>
</div>-->
<!-- 卡支付-国内卡费率配置 -->
<div class="form-group"
ng-class="{'has-error':org_form.rpaypmt_domestic_card_rate_value.$invalid && org_form.rpaypmt_domestic_card_rate_value.$dirty}">
<label class="control-label col-sm-2" for="rpaypmt_domestic_card_rate_value_input">Domestic Card Payment Rate *</label>
<div class="col-sm-8">
<div class="input-group">
<input class="form-control" type="number" ng-model="org.rpaypmt_domestic_card_rate_value"
id="rpaypmt_domestic_card_rate_value_input" name="rpaypmt_domestic_card_rate_value"
max="100" min="0" required>
<span class="input-group-addon">%</span>
</div>
</div>
</div> </div>
<!-- 卡支付-国际卡费率配置 -->
<div class="form-group"
ng-class="{'has-error':org_form.rpaypmt_overseas_card_rate_value.$invalid && org_form.rpaypmt_overseas_card_rate_value.$dirty}">
<label class="control-label col-sm-2" for="rpaypmt_overseas_card_rate_value_input">Overseas Card Payment Rate *</label>
<div class="col-sm-8">
<div class="input-group">
<input class="form-control" type="number" ng-model="org.rpaypmt_overseas_card_rate_value"
id="rpaypmt_overseas_card_rate_value_input" name="rpaypmt_overseas_card_rate_value"
max="100" min="0" required>
<span class="input-group-addon">%</span>
</div>
</div>
</div>
<div class="form-group" <div class="form-group"
ng-class="{'has-error':org_form.rpaypmt_dd_rate_value.$invalid && org_form.rpaypmt_dd_rate_value.$dirty}"> ng-class="{'has-error':org_form.rpaypmt_dd_rate_value.$invalid && org_form.rpaypmt_dd_rate_value.$dirty}">
<label class="control-label col-sm-2" for="rpaypmt_dd_rate_value_input">Direct Debit Rate *</label> <label class="control-label col-sm-2" for="rpaypmt_dd_rate_value_input">Direct Debit Rate *</label>
@ -239,7 +268,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="form-group" <!-- <div class="form-group"
ng-class="{'has-error':org_form.min_rpaypmt_card_rate.$invalid && org_form.min_rpaypmt_card_rate.$dirty}"> ng-class="{'has-error':org_form.min_rpaypmt_card_rate.$invalid && org_form.min_rpaypmt_card_rate.$dirty}">
<label class="control-label col-sm-2" for="min_rpaypmt_card_rate_input">Min Card Payment Rate</label> <label class="control-label col-sm-2" for="min_rpaypmt_card_rate_input">Min Card Payment Rate</label>
<div class="col-sm-8"> <div class="col-sm-8">
@ -251,6 +280,35 @@
</div> </div>
</div> </div>
</div> </div>
-->
<!-- 卡支付-国内卡最小费率配置 -->
<div class="form-group"
ng-class="{'has-error':org_form.min_rpaypmt_domestic_card_rate.$invalid && org_form.min_rpaypmt_domestic_card_rate.$dirty}">
<label class="control-label col-sm-2" for="min_rpaypmt_domestic_card_rate_input">Min Domestic Card Payment Rate</label>
<div class="col-sm-8">
<div class="input-group">
<input class="form-control" type="number" ng-model="org.min_rpaypmt_domestic_card_rate"
id="min_rpaypmt_domestic_card_rate_input" name="min_rpaypmt_domestic_card_rate" max="100"
min="0">
<span class="input-group-addon">%</span>
</div>
</div>
</div>
<!-- 卡支付-国内卡最小费率配置 -->
<div class="form-group"
ng-class="{'has-error':org_form.min_rpaypmt_overseas_card_rate.$invalid && org_form.min_rpaypmt_overseas_card_rate.$dirty}">
<label class="control-label col-sm-2" for="min_rpaypmt_overseas_card_rate_input">Min Overseas Card Payment Rate</label>
<div class="col-sm-8">
<div class="input-group">
<input class="form-control" type="number" ng-model="org.min_rpaypmt_overseas_card_rate"
id="min_rpaypmt_overseas_card_rate_input" name="min_rpaypmt_overseas_card_rate" max="100"
min="0">
<span class="input-group-addon">%</span>
</div>
</div>
</div>
<div class="form-group" <div class="form-group"
ng-class="{'has-error':org_form.min_rpaypmt_dd_rate.$invalid && org_form.min_rpaypmt_dd_rate.$dirty}"> ng-class="{'has-error':org_form.min_rpaypmt_dd_rate.$invalid && org_form.min_rpaypmt_dd_rate.$dirty}">
<label class="control-label col-sm-2" for="min_rpaypmt_dd_rate_input">Min Direct Debit Rate</label> <label class="control-label col-sm-2" for="min_rpaypmt_dd_rate_input">Min Direct Debit Rate</label>

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

@ -143,13 +143,32 @@
<span class="input-group-addon form-control-span">%</span> <span class="input-group-addon form-control-span">%</span>
</div> </div>
</div> </div>
<div class="form-group" ng-class="{'has-error':org_form.rpaypmt_card_rate_value.$invalid && org_form.rpaypmt_card_rate_value.$dirty}"> <!--<div class="form-group" ng-class="{'has-error':org_form.rpaypmt_card_rate_value.$invalid && org_form.rpaypmt_card_rate_value.$dirty}">
<label class="control-label col-sm-2" for="rpaypmt_card_rate_value_input">Card Payment Rate *</label> <label class="control-label col-sm-2" for="rpaypmt_card_rate_value_input">Card Payment Rate *</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input class="form-control form-control-float" type="number" ng-model="org.rpaypmt_card_rate_value" id="rpaypmt_card_rate_value_input" name="rpaypmt_card_rate_value" max="100" min="0" required> <input class="form-control form-control-float" type="number" ng-model="org.rpaypmt_card_rate_value" id="rpaypmt_card_rate_value_input" name="rpaypmt_card_rate_value" max="100" min="0" required>
<span class="input-group-addon form-control-span">%</span> <span class="input-group-addon form-control-span">%</span>
</div> </div>
</div>-->
<!-- 卡支付-国内卡费率配置 -->
<div class="form-group" ng-class="{'has-error':org_form.rpaypmt_domestic_card_rate_value.$invalid && org_form.rpaypmt_domestic_card_rate_value.$dirty}">
<label class="control-label col-sm-2" for="rpaypmt_domestic_card_rate_value_input">Domestic Card Payment Rate *</label>
<div class="col-sm-8">
<input class="form-control form-control-float" type="number" ng-model="org.rpaypmt_domestic_card_rate_value" id="rpaypmt_domestic_card_rate_value_input" name="rpaypmt_card_rate_value" max="100" min="0" required>
<span class="input-group-addon form-control-span">%</span>
</div> </div>
</div>
<!-- 卡支付-国际卡费率配置 -->
<div class="form-group" ng-class="{'has-error':org_form.rpaypmt_overseas_card_rate_value.$invalid && org_form.rpaypmt_overseas_card_rate_value.$dirty}">
<label class="control-label col-sm-2" for="rpaypmt_overseas_card_rate_value_input">Overseas Card Payment Rate *</label>
<div class="col-sm-8">
<input class="form-control form-control-float" type="number" ng-model="org.rpaypmt_overseas_card_rate_value" id="rpaypmt_overseas_card_rate_value_input" name="rpaypmt_card_rate_value" max="100" min="0" required>
<span class="input-group-addon form-control-span">%</span>
</div>
</div>
<div class="form-group" ng-class="{'has-error':org_form.rpaypmt_dd_rate_value.$invalid && org_form.rpaypmt_dd_rate_value.$dirty}"> <div class="form-group" ng-class="{'has-error':org_form.rpaypmt_dd_rate_value.$invalid && org_form.rpaypmt_dd_rate_value.$dirty}">
<label class="control-label col-sm-2" for="rpaypmt_dd_rate_value_input">Direct Debit Rate *</label> <label class="control-label col-sm-2" for="rpaypmt_dd_rate_value_input">Direct Debit Rate *</label>
<div class="col-sm-8"> <div class="col-sm-8">
@ -198,7 +217,7 @@
<span class="input-group-addon form-control-span">%</span> <span class="input-group-addon form-control-span">%</span>
</div> </div>
</div> </div>
<div class="form-group" <!-- <div class="form-group"
ng-class="{'has-error':org_form.min_rpaypmt_card_rate.$invalid && org_form.min_rpaypmt_card_rate.$dirty}"> ng-class="{'has-error':org_form.min_rpaypmt_card_rate.$invalid && org_form.min_rpaypmt_card_rate.$dirty}">
<label class="control-label col-sm-2" for="min_rpaypmt_card_rate_input">Min Card Payment Rate</label> <label class="control-label col-sm-2" for="min_rpaypmt_card_rate_input">Min Card Payment Rate</label>
<div class="col-sm-8"> <div class="col-sm-8">
@ -206,6 +225,28 @@
id="min_rpaypmt_card_rate_input" name="min_rpaypmt_card_rate" max="100" min="0"> id="min_rpaypmt_card_rate_input" name="min_rpaypmt_card_rate" max="100" min="0">
<span class="input-group-addon form-control-span">%</span> <span class="input-group-addon form-control-span">%</span>
</div> </div>
</div>-->
<!-- 卡支付-国内卡最小费率配置 -->
<div class="form-group"
ng-class="{'has-error':org_form.min_rpaypmt_domestic_card_rate.$invalid && org_form.min_rpaypmt_domestic_card_rate.$dirty}">
<label class="control-label col-sm-2" for="min_rpaypmt_domestic_card_rate_input">Min Domestic Card Payment Rate</label>
<div class="col-sm-8">
<input class="form-control form-control-float" type="number" ng-model="org.min_rpaypmt_domestic_card_rate"
id="min_rpaypmt_domestic_card_rate_input" name="min_rpaypmt_domestic_card_rate" max="100" min="0">
<span class="input-group-addon form-control-span">%</span>
</div>
</div>
<!-- 卡支付-国内卡最小费率配置 -->
<div class="form-group"
ng-class="{'has-error':org_form.min_rpaypmt_overseas_card_rate.$invalid && org_form.min_rpaypmt_overseas_card_rate.$dirty}">
<label class="control-label col-sm-2" for="min_rpaypmt_overseas_card_rate_input">Min Overseas Card Payment Rate</label>
<div class="col-sm-8">
<input class="form-control form-control-float" type="number" ng-model="org.min_rpaypmt_overseas_card_rate"
id="min_rpaypmt_overseas_card_rate_input" name="min_rpaypmt_overseas_card_rate" max="100" min="0">
<span class="input-group-addon form-control-span">%</span>
</div>
</div> </div>
<div class="form-group" <div class="form-group"

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

@ -230,12 +230,12 @@
<li role="presentation" ng-class="{active:bankCtrl.rate_name=='AlipayOnline'}"><a role="button" <li role="presentation" ng-class="{active:bankCtrl.rate_name=='AlipayOnline'}"><a role="button"
ng-click="bankCtrl.rate_name='AlipayOnline'">Alipay(Online)</a> ng-click="bankCtrl.rate_name='AlipayOnline'">Alipay(Online)</a>
</li> </li>
<li role="presentation" ng-class="{active:bankCtrl.rate_name=='Bestpay'}"><a role="button" <!-- <li role="presentation" ng-class="{active:bankCtrl.rate_name=='Bestpay'}"><a role="button"
ng-click="bankCtrl.rate_name='Bestpay'">Bestpay</a> ng-click="bankCtrl.rate_name='Bestpay'">Bestpay</a>
</li> </li>
<li role="presentation" ng-class="{active:bankCtrl.rate_name=='jd'}"><a role="button" <li role="presentation" ng-class="{active:bankCtrl.rate_name=='jd'}"><a role="button"
ng-click="bankCtrl.rate_name='jd'">JDpay</a> ng-click="bankCtrl.rate_name='jd'">JDpay</a>
</li> </li>-->
<!--<li role="presentation" ng-class="{active:bankCtrl.rate_name=='hf'}"><a role="button" ng-click="bankCtrl.rate_name='hf'">HFpay</a></li>--> <!--<li role="presentation" ng-class="{active:bankCtrl.rate_name=='hf'}"><a role="button" ng-click="bankCtrl.rate_name='hf'">HFpay</a></li>-->
<li role="presentation" ng-class="{active:bankCtrl.rate_name=='Rpay'}"><a role="button" <li role="presentation" ng-class="{active:bankCtrl.rate_name=='Rpay'}"><a role="button"
ng-click="bankCtrl.rate_name='Rpay'">Rpay+</a> ng-click="bankCtrl.rate_name='Rpay'">Rpay+</a>

6
src/main/ui/static/payment/partner/templates/partner_new_rate.html
Unescape View File

@ -143,7 +143,7 @@
<div class="col-sm-6"> <div class="col-sm-6">
<div class="input-group"> <div class="input-group">
<input type="number" name="cb_bankpay_rate_value" stringToNumber2 class="form-control" ng-model="rate.cb_bankpay_rate_value" <input type="number" name="cb_bankpay_rate_value" stringToNumber2 class="form-control" ng-model="rate.cb_bankpay_rate_value"
min="0.6" max="5" step="0.1" id="cb_bankpay_rate_value_input" required> min="0.6" max="5" step="0.1" id="cb_bankpay_rate_value_input">
<div class="input-group-addon">%</div> <div class="input-group-addon">%</div>
</div> </div>
<div ng-messages="rate_form.cb_bankpay_rate_value.$error" ng-if="rate_form.cb_bankpay_rate_value.$dirty"> <div ng-messages="rate_form.cb_bankpay_rate_value.$error" ng-if="rate_form.cb_bankpay_rate_value.$dirty">
@ -153,9 +153,9 @@
<div class="small text-danger" ng-message="min"> <div class="small text-danger" ng-message="min">
<i class="glyphicon glyphicon-alert"></i> No less than 0.6% <i class="glyphicon glyphicon-alert"></i> No less than 0.6%
</div> </div>
<div class="small text-danger" ng-message="required"> <!--<div class="small text-danger" ng-message="required">
<i class="glyphicon glyphicon-alert"></i> Required Field <i class="glyphicon glyphicon-alert"></i> Required Field
</div> </div>-->
</div> </div>
</div> </div>

Write Preview
Loading…
Cancel
Save