master
wangning 7 years ago
parent 5c0292e3ad
commit da4df801cb

@ -99,6 +99,12 @@ ALTER TABLE `pat_goods`
ALTER TABLE `pat_goods_sale` ALTER TABLE `pat_goods_sale`
MODIFY COLUMN `good_id` varchar(50) NOT NULL AFTER `client_id`; 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 '开户者';

@ -560,19 +560,19 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
String username = clientMoniker + client.getString("sub_merchant_id"); String username = clientMoniker + client.getString("sub_merchant_id");
boolean duplicated = true; boolean duplicated = true;
String pwd = RandomStringUtils.random(8, true, true); String pwd = RandomStringUtils.random(8, true, true);
while (duplicated) { // while (duplicated) {
NewAccountBean account = new NewAccountBean(); // NewAccountBean account = new NewAccountBean();
account.setDisplayName(clientMoniker + " Admin"); // account.setDisplayName(clientMoniker + " Admin");
account.setRole(PartnerRole.ADMIN.getCode()); // account.setRole(PartnerRole.ADMIN.getCode());
account.setUsername(username); // account.setUsername(username);
account.setPwd(pwd); // account.setPwd(pwd);
try { // try {
newAccount(clientMoniker, account, manager, 1); // newAccount(clientMoniker, account, manager, 1);
duplicated = false; // duplicated = false;
} catch (Exception e) { // } catch (Exception e) {
username += "1"; // username += "1";
} // }
} // }
sendInitEmail(client, username, pwd); sendInitEmail(client, username, pwd);
} }

Loading…
Cancel
Save