Merge branch 'hotfix' into develop

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);

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);