diff --git a/pom.xml b/pom.xml
index 29c4bd132..220f68bf0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
4.0.0
manage
- 1.2.71
+ 1.2.72
UTF-8
1.6.1
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 a137baf6f..fb8f5d81a 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
@@ -420,15 +420,13 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
client.put("temp_sub_merchant", checkSubMerchantIdInCommonPool(subMerchantId));
}
}
- if (client.getIntValue("approve_result") == 1
- || (client.getIntValue("approve_result") == 2 && (client.getIntValue("source") == 1 || client.getIntValue("source") == 2))) {
- try {
- JSONObject activeRate = merchantInfoProvider.clientCurrentRate(client.getIntValue("client_id"), new Date(), "Wechat");
- if (activeRate != null) {
- client.put("rate_value", activeRate.getDouble("rate_value"));
- }
- } catch (Exception ignore) {
+ try {
+ JSONObject activeRate = merchantInfoProvider.clientCurrentRate(client.getIntValue("client_id"), new Date(), "Wechat");
+ if (activeRate != null) {
+ client.put("rate_value", activeRate.getDouble("rate_value"));
}
+ } catch (Exception ignore) {
+
}
client.put("max_customer_surcharge_rate", PlatformEnvironment.getEnv().getMaxCustomerSurchargeRate());
if (client.getBigDecimal("rate_value") != null) {