UTF-8
2.4.0
diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
index 3a46dabec..1698bd2dc 100644
--- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
@@ -1953,7 +1953,9 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
}};
newConfig.put("ext_rates", extRateParams.toJSONString());
}
- clientRateMapper.saveRate(newConfig);
+ if(newConfig.getBigDecimal("cb_bankpay_rate_value") != null){
+ clientRateMapper.saveRate(newConfig);
+ }
logger.info(clientId + "的" + channel + "费率设置成功");
}
}
diff --git a/src/main/java/au/com/royalpay/payment/manage/organizations/beans/OrgInfo.java b/src/main/java/au/com/royalpay/payment/manage/organizations/beans/OrgInfo.java
index 2b315e57f..43f8667fb 100644
--- a/src/main/java/au/com/royalpay/payment/manage/organizations/beans/OrgInfo.java
+++ b/src/main/java/au/com/royalpay/payment/manage/organizations/beans/OrgInfo.java
@@ -28,7 +28,11 @@ public class OrgInfo {
private Double wechat_rate_value;
private Double alipayonline_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 int is_valid;
private String search_text;
@@ -42,6 +46,8 @@ public class OrgInfo {
private Double min_alipayonline_rate;
private Double min_cb_bankpay_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 String state;
private String senior_parent_org_id;
@@ -292,17 +298,17 @@ public class OrgInfo {
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() {
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) {
this.rpaypmt_card_rate_value = rpaypmt_card_rate_value;
- }
+ }*/
public void setRpaypmt_dd_rate_value(Double 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) {
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;
+ }
+
}
diff --git a/src/main/ui/static/config/organizations/templates/new_org.html b/src/main/ui/static/config/organizations/templates/new_org.html
index 426e5f32c..7dabe42d0 100644
--- a/src/main/ui/static/config/organizations/templates/new_org.html
+++ b/src/main/ui/static/config/organizations/templates/new_org.html
@@ -166,7 +166,7 @@
-
+ -->
+
+
+
+
+
+
+
@@ -239,7 +268,7 @@
-
+-->
+
+
+
+
+
+
diff --git a/src/main/ui/static/config/organizations/templates/org_detail.html b/src/main/ui/static/config/organizations/templates/org_detail.html
index c0f17829d..9e004fd27 100644
--- a/src/main/ui/static/config/organizations/templates/org_detail.html
+++ b/src/main/ui/static/config/organizations/templates/org_detail.html
@@ -143,13 +143,32 @@
%
-