From f960c882007f6b6bfe21698e23e6be08639d429c Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Wed, 6 Nov 2019 11:29:58 +0800
Subject: [PATCH] =?UTF-8?q?fix=20customer=5Fsurcharge=5Frate=20=E6=9C=AA?=
 =?UTF-8?q?=E9=80=9A=E8=BF=87=E4=B9=9F=E5=8F=AF=E4=BB=A5=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                            |  2 +-
 .../merchants/core/impls/ClientManagerImpl.java    | 14 ++++++--------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index 29c4bd132..220f68bf0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>1.2.71</version>
+    <version>1.2.72</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>1.6.1</jib-maven-plugin.version>
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) {