脚本优化

biz/merchant/services/MerchantService.php

@@ -139,7 +139,7 @@ class MerchantService extends BaseService
 	{
 		return MerchantClass::getCurrentSetId($id);
 	}
-	
+
 	//开店公众号授权之后初始化 shish 2020.2.7
 	public static function openShopInit($data)
 	{
@@ -159,6 +159,7 @@ class MerchantService extends BaseService
 			
 			//初始化微信菜单
 			xhWxMenuService::applyInit($merchant);
+			
 			//微信客户初始化
 			$return = UserService::syncWxAllUser($merchantId);
 			$totalNum = isset($return['total']) ? $return['total'] : 0;
@@ -169,28 +170,37 @@ class MerchantService extends BaseService
 			$shopReturn = ShopClass::addShop($shopData);
 			$shopId = $shopReturn['id'];
 			
-			//创建管理员角色
-			AdminRoleClass::addAdminRole(['roleName' => '店员', 'merchantId' => $merchantId, 'auth' => '*']);
-			$roleReturn = AdminRoleClass::addAdminRole(['roleName' => '老板', 'merchantId' => $merchantId, 'auth' => '*']);
-			$roleId = $roleReturn['id'];
+			//设置商家默认门店
+			MerchantClass::updateByCondition(['merchantId' => $merchantId], ['defaultShopId' => $shopId]);
 			
+			//创建管理员角色
+			$hasRole = AdminRoleClass::getByCondition(['merchantId' => $merchantId, 'roleName' => '老板']);
+			if (empty($hasRole)) {
+				AdminRoleClass::addAdminRole(['roleName' => '店员', 'merchantId' => $merchantId, 'auth' => '*']);
+				$roleReturn = AdminRoleClass::addAdminRole(['roleName' => '老板', 'merchantId' => $merchantId, 'auth' => '*']);
+				$roleId = $roleReturn['id'];
+			}
+
 			if ($platform == 1) {
 				//平台使用的公众号创建指定管理员
-				$adminData = [
-					'mobile' => 15280215347,
-					'adminName' => '石少华',
-					'password' => password_hash('123456', PASSWORD_BCRYPT),
-					'confirmPassword' => password_hash('123456', PASSWORD_BCRYPT),
-					'merchantId' => $merchantId,
-					'roleId' => $roleId,
-					'defaultShopId' => $shopId,
-					'currentShopId' => $shopId,
-					'super' => 1,
-					'addTime' => $time,
-				];
-				AdminClass::addAdmin($adminData);
+				$admin = AdminClass::getByCondition(['merchantId' => $merchantId, 'mobile' => 15280215347]);
+				if (empty($admin)) {
+					$adminData = [
+						'mobile' => 15280215347,
+						'adminName' => '石少华',
+						'password' => password_hash('123456', PASSWORD_BCRYPT),
+						'confirmPassword' => password_hash('123456', PASSWORD_BCRYPT),
+						'merchantId' => $merchantId,
+						'roleId' => $roleId,
+						'defaultShopId' => $shopId,
+						'currentShopId' => $shopId,
+						'super' => 1,
+						'addTime' => $time,
+					];
+					AdminClass::addAdmin($adminData);
+				}
 			}
-			
+
 			//模板消息
 			xhTMessageService::init($merchant);
 

common/services/xhTMessageService.php

@@ -43,7 +43,7 @@ class xhTMessageService
 	//商家模板初始化 shish 2020.2.9
 	public static function init($merchant)
 	{
-		//设置模板消息所属行业   IT科技 互联网/电子商务 消费品 消费品
+		//设置模板消息所属行业：IT科技 互联网/电子商务 消费品 消费品
 		wxUtil::setTMIndustry($merchant, 1, 31);
 		$merchantId = $merchant['id'];
 		$original = configDict::getConfig('tMessage');