diff --git a/pom.xml b/pom.xml
index b3a8695e7..553b53d00 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
4.0.0
manage
- 1.4.17
+ 1.4.18
UTF-8
1.8.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 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 clientIds = new ArrayList<>();