From de65a22e7b2b7439f8e336689fe03ae3cef9cfba Mon Sep 17 00:00:00 2001
From: yuan <1551130722@qq.com>
Date: Mon, 4 Jun 2018 20:23:12 +0800
Subject: [PATCH 1/2] fix~

---
 .../static/payment/partner/templates/partners_applications.html  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/ui/static/payment/partner/templates/partners_applications.html b/src/main/ui/static/payment/partner/templates/partners_applications.html
index 6d3cb3ff6..4f9f53f4a 100644
--- a/src/main/ui/static/payment/partner/templates/partners_applications.html
+++ b/src/main/ui/static/payment/partner/templates/partners_applications.html
@@ -17,6 +17,7 @@
                         <li ui-sref-active-eq="active">
                             <a ui-sref="partner_application">Partner Application</a>
                         </li>
+
                         <li ui-sref-active="active" ng-if="('10'|withRole) || ('1'|withRole)">
                             <a ui-sref="partner_application.simple_application">Application & Open</a>
                         </li>

From 72454b3a49f2bf0b37f8683b6def1168875d988e Mon Sep 17 00:00:00 2001
From: wangning <164851225@qq.com>
Date: Tue, 5 Jun 2018 16:40:14 +0800
Subject: [PATCH 2/2] fixbug

---
 .../application/core/impls/SimpleClientApplyServiceImpl.java   | 1 +
 .../payment/manage/merchants/core/impls/ClientManagerImpl.java | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/application/core/impls/SimpleClientApplyServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/application/core/impls/SimpleClientApplyServiceImpl.java
index 4f263f47d..abdc2fa9d 100644
--- a/src/main/java/au/com/royalpay/payment/manage/application/core/impls/SimpleClientApplyServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/application/core/impls/SimpleClientApplyServiceImpl.java
@@ -289,6 +289,7 @@ public class SimpleClientApplyServiceImpl implements SimpleClientApplyService {
         sysClient.put("sub_merchant_id", tempSubMerchantId);
         sysClient.put("common_sub_merchant_id", 1);
         sysClient.put("skip_clearing", 1);
+        sysClient.put("clean_days", apply.getIntValue("clean_days"));
         sysClient.put("country", "AUS");
         sysClient.put("credential_code", RandomStringUtils.random(32, true, true));
         clientMapper.save(sysClient);
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 b151c805e..dd69cadff 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
@@ -124,7 +124,6 @@ import org.springframework.cache.annotation.Cacheable;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.context.ApplicationEventPublisherAware;
 import org.springframework.context.MessageSource;
-import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -747,6 +746,8 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
                 JSONObject account = accounts.get(0);
                 sendInitEmail(manager, client, account.getString("username"), "*****");
                 saveClientAuditProcess(client.getIntValue("client_id"), open_status, 5, "合规通过", manager);
+                clientModifySupport.processClientConfigModify(new SwitchPermissionModify(manager,clientMoniker,"skip_clearing",false));
+                clientModifySupport.processClientConfigModify(new SwitchPermissionModify(manager,clientMoniker,"common_sub_merchant_id",false));
             } else if (checkGreenChannel && client.getIntValue("open_status") == 5) {
                 // 绿色通道通过后不发邮件
                 logger.info("PASS 绿色通道:" + clientMoniker);