From 0910e49c6b71b12fc0b5feec1b9c2bc2fd33ca8c Mon Sep 17 00:00:00 2001
From: gxwebsoft <Websoft5386339>
Date: Mon, 29 Apr 2024 12:25:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E9=80=A0=E7=A7=9F=E6=88=B7=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/TenantServiceImpl.java       | 30 +++++++++++--------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/gxwebsoft/common/system/service/impl/TenantServiceImpl.java b/src/main/java/com/gxwebsoft/common/system/service/impl/TenantServiceImpl.java
index dbbe011..54c8638 100644
--- a/src/main/java/com/gxwebsoft/common/system/service/impl/TenantServiceImpl.java
+++ b/src/main/java/com/gxwebsoft/common/system/service/impl/TenantServiceImpl.java
@@ -118,7 +118,6 @@ public class TenantServiceImpl extends ServiceImpl<TenantMapper, Tenant> impleme
       // 企业资源配置
       company.setTenantId(company.getTid());
       company.setShortName(company.getShortName());
-      company.setCompanyLogo("/logo.svg");
       company.setPhone(company.getPhone());
       company.setMembers(20);
       company.setServerUrl("https://server.gxwebsoft.com");
@@ -128,8 +127,8 @@ public class TenantServiceImpl extends ServiceImpl<TenantMapper, Tenant> impleme
       company.setMerchantUrl("http://".concat(company.getTid().toString()).concat(".m.wsdns.cn"));
       company.setWebsiteUrl("http://".concat(company.getTid().toString()).concat(".wsdns.cn"));
       company.setH5Code("http://".concat(company.getTid().toString()).concat(".h5.wsdns.cn"));
-      company.setAndroidUrl("http://".concat(company.getTid().toString()).concat(".android.wsdns.cn"));
-      company.setIosUrl("http://".concat(company.getTid().toString()).concat(".ios.wsdns.cn"));
+//      company.setAndroidUrl("http://".concat(company.getTid().toString()).concat(".android.wsdns.cn"));
+//      company.setIosUrl("http://".concat(company.getTid().toString()).concat(".ios.wsdns.cn"));
       company.setVersion(10);
       company.setIndustryParent("");
       company.setIndustryChild("");
@@ -166,15 +165,22 @@ public class TenantServiceImpl extends ServiceImpl<TenantMapper, Tenant> impleme
         role.setRoleCode("guest");
         role.setComments("用于未登录时的浏览权限");
         roleService.save(role);
+        role.setRoleName("商户管理员");
+        role.setRoleCode("merchant");
+        role.setComments("商户管理员/店长角色");
+        roleService.save(role);
+        role.setRoleName("商户账号");
+        role.setRoleCode("merchantClerk");
+        role.setRoleName("管理人员/店员");
         Integer guestRoleId = role.getRoleId();
 
         // 添加游客账号
-        User www = new User();
-        www.setTenantId(company.getTid());
-        www.setUsername("www");
-        www.setNickname("游客");
-        www.setPassword(userService.encodePassword(CommonUtil.randomUUID16()));
-        userService.save(www);
+//        User www = new User();
+//        www.setTenantId(company.getTid());
+//        www.setUsername("www");
+//        www.setNickname("游客");
+//        www.setPassword(userService.encodePassword(CommonUtil.randomUUID16()));
+//        userService.save(www);
 
         // 添加超管用户角色
         UserRole userRole = new UserRole();
@@ -184,8 +190,8 @@ public class TenantServiceImpl extends ServiceImpl<TenantMapper, Tenant> impleme
         userRoleService.save(userRole);
 
         // 添加游客用户角色
-        userRole.setUserId(www.getUserId());
-        userRole.setRoleId(guestRoleId);
+//        userRole.setUserId(www.getUserId());
+//        userRole.setRoleId(guestRoleId);
         boolean resultUserRole = userRoleService.save(userRole);
 
         // 添加系统菜单
@@ -584,7 +590,7 @@ public class TenantServiceImpl extends ServiceImpl<TenantMapper, Tenant> impleme
       // 发送邮件通知
       String title = "恭喜！您的账号已注册成功";
       String content = "租户ID：".concat(company.getTid().toString()).concat("\r\n名称：" + company.getShortName()).concat("\r\n账号：" + company.getPhone()).concat("\r\n密码：" + company.getPassword());
-      String adminUrl = "\r\n后台管理：".concat("https://admin.gxwebsoft.com");
+      String adminUrl = "\r\n后台管理：".concat("http://").concat(company.getTid().toString()).concat(".adm.wsdns.cn");
       // 发送邮件通知
       emailRecordService.sendEmail(title, content.concat(adminUrl), company.getEmail());
       return true;