From da4df801cbe76c807bd6ce84a840329be6351f59 Mon Sep 17 00:00:00 2001
From: wangning <164851225@qq.com>
Date: Mon, 25 Dec 2017 19:38:38 +0800
Subject: [PATCH] update

---
 src/db/modify.sql                             |  6 +++++
 .../core/impls/ClientManagerImpl.java         | 26 +++++++++----------
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/src/db/modify.sql b/src/db/modify.sql
index 6421655ac..cef6741b5 100644
--- a/src/db/modify.sql
+++ b/src/db/modify.sql
@@ -99,6 +99,12 @@ ALTER TABLE `pat_goods`
 ALTER TABLE `pat_goods_sale`
   MODIFY COLUMN `good_id`  varchar(50) NOT NULL AFTER `client_id`;
 
+ALTER TABLE `commodities`
+  MODIFY COLUMN `create_id`  varchar(50) DEFAULT NULL;
+
+ALTER TABLE `sys_accounts`
+  MODIFY COLUMN `creator`  varchar(50) NOT NULL COMMENT '开户者';
+
 
 
 
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 097c7ca93..3fc376b84 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
@@ -560,19 +560,19 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         String username = clientMoniker + client.getString("sub_merchant_id");
         boolean duplicated = true;
         String pwd = RandomStringUtils.random(8, true, true);
-        while (duplicated) {
-            NewAccountBean account = new NewAccountBean();
-            account.setDisplayName(clientMoniker + " Admin");
-            account.setRole(PartnerRole.ADMIN.getCode());
-            account.setUsername(username);
-            account.setPwd(pwd);
-            try {
-                newAccount(clientMoniker, account, manager, 1);
-                duplicated = false;
-            } catch (Exception e) {
-                username += "1";
-            }
-        }
+//        while (duplicated) {
+//            NewAccountBean account = new NewAccountBean();
+//            account.setDisplayName(clientMoniker + " Admin");
+//            account.setRole(PartnerRole.ADMIN.getCode());
+//            account.setUsername(username);
+//            account.setPwd(pwd);
+//            try {
+//                newAccount(clientMoniker, account, manager, 1);
+//                duplicated = false;
+//            } catch (Exception e) {
+//                username += "1";
+//            }
+//        }
         sendInitEmail(client, username, pwd);
     }