切换门店还要再调整

biz-ty/shop/classes/ShopClass.php

@@ -27,7 +27,7 @@ class ShopClass extends BaseClass
 	{
 		return isset($merchant['defaultShopId']) ? $merchant['defaultShopId'] : 0;
 	}
-	
+
 	//创建门店 shish 2020.2.8
 	public static function addShop($data)
 	{
@@ -41,10 +41,9 @@ class ShopClass extends BaseClass
 			util::fail('门店名称已经存在');
 		}
 		$shop = self::add($data);
-		
 		return $shop;
 	}
-	
+
 	//更新门店 shish 2020.2.29
 	public static function updateShop($id, $data)
 	{
@@ -122,5 +121,5 @@ class ShopClass extends BaseClass
 	{
 		return self::getAllByCondition(['merchantId' => $sjId, 'delStatus' => 0], null, ['id']);
 	}
-
+	
 }

biz-ty/sj/classes/MerchantClass.php

@@ -141,7 +141,6 @@ class MerchantClass extends BaseClass
 			'riseAmount' => 0,
 		];
 		GoodsSettingClass::add($setData);
-		
 		//创建门店
 		$shopData = [
 			'shopName' => $sj['merchantName'],
@@ -191,7 +190,7 @@ class MerchantClass extends BaseClass
 					ShopAdminClass::add($shopData);
 				}
 			}
-
+			
 			if (isset($applyData['introSjId']) && $applyData['introStyle'] == MerchantClass::STYLE_SUPPLIER) {
 				if ($applyData['style'] == MerchantClass::STYLE_RETAIL) {
 					$introSjId = $applyData['introSjId'];
@@ -206,7 +205,6 @@ class MerchantClass extends BaseClass
 					CustomClass::addCustom($customData);
 				}
 			}
-			
 		} elseif ($applyData['style'] == MerchantClass::STYLE_SUPPLIER) {
 			//创建管理员角色
 			$roleId = 0;
@@ -218,7 +216,6 @@ class MerchantClass extends BaseClass
 			}
 			//创建管理员
 			if (!empty($adminId)) {
-				
 				$shopAdmin = \bizGhs\shop\classes\ShopAdminClass::getByCondition(['shopId' => $shopId, 'adminId' => $adminId]);
 				if (empty($shopAdmin)) {
 					$adminData = [
@@ -226,7 +223,6 @@ class MerchantClass extends BaseClass
 						'confirmPassword' => password_hash($mobile, PASSWORD_BCRYPT),
 						'mobile' => $mobile
 					];
-					
 					\bizGhs\admin\classes\AdminClass::updateById($adminId, $adminData);
 					$shopData = [
 						'adminId' => $adminId,