From 3af3762cc32f389d5c69fcaba4f57efdf6e48de8 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Thu, 26 Mar 2020 14:37:18 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E4=BC=98=E5=8C=96=E5=95=86=E6=88=B7?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=A2=9E=E5=80=BC=E6=9C=8D=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |  2 +-
 .../core/impls/ClientManagerImpl.java         | 27 ++++++++++++-------
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/pom.xml b/pom.xml
index b3a8695e7..553b53d00 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>1.4.17</version>
+    <version>1.4.18</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>1.8.0</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 8aedaff3b..df87e3b4a 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
@@ -6592,15 +6592,8 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         saveIncrementalService.put("title", incrementalService.getString("title"));
         if (existIncrementalService == null) {
             clientIncrementalMapper.save(saveIncrementalService);
-            if (incrementalService.getBigDecimal("total_incremental_amount").compareTo(new BigDecimal(0)) > 0) {
-                saveIncrementalService.put("amount", incrementalService.getString("total_incremental_amount"));
-                saveIncrementalService.put("service_code", "RYCBSM");
-                String title = incrementalService.getString("title");
-                if (StringUtils.isBlank(title)) {
-                    title = "RP跨境商城开通费用";
-                }
-                saveIncrementalService.put("title", title);
-                rServicesApplyService.saveDebitDetail(saveIncrementalService, client);
+            if (StringUtils.equalsIgnoreCase("RP跨境商城", saveIncrementalService.getString("channel"))) {
+                afterGeekShopSave(saveIncrementalService, client);
             }
         } else {
             clientIncrementalMapper.update(saveIncrementalService);
@@ -6678,6 +6671,22 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         }
     }
 
+    private void afterGeekShopSave(JSONObject serviceInfo, JSONObject client) {
+        JSONObject clientConfig = clientConfigMapper.find(client.getIntValue("client_id"));
+        clientConfig.put("geek_shop_status", 1);
+        clientConfigMapper.update(clientConfig);
+        if (serviceInfo.getBigDecimal("total_incremental_amount").compareTo(new BigDecimal(0)) > 0) {
+            serviceInfo.put("amount", serviceInfo.getString("total_incremental_amount"));
+            serviceInfo.put("service_code", "RYCBSM");
+            String title = serviceInfo.getString("title");
+            if (StringUtils.isBlank(title)) {
+                title = "RP跨境商城开通费用";
+            }
+            serviceInfo.put("title", title);
+            rServicesApplyService.saveDebitDetail(serviceInfo, client);
+        }
+    }
+
     private String[] getChildClientIds(int clientId) {
         JSONObject mchConfig = merchantInfoProvider.getMchExtParams(clientId);
         List<String> clientIds = new ArrayList<>();