更新

app/saas/config/main.php

@@ -7,7 +7,7 @@ $params = array_merge(
 );
 
 return [
-    'id' => 'app-platform',
+    'id' => 'app-saas',
     'basePath' => dirname(__DIR__),
     'controllerNamespace' => 'saas\controllers',
     'bootstrap' => ['log'],
@@ -18,7 +18,7 @@ return [
 		    'identityClass' => 'common\models\xhWxOpenAdmin',
 		    'enableAutoLogin' => true,
 		    'identityCookie' => [
-		    	'name' => 'platformUser', // unique for platform
+		    	'name' => 'saasUser', // unique for platform
 		    ],
 		    'loginUrl' => ['main/login'],
 	    ],

app/www/config/main.php

@@ -18,7 +18,7 @@ return [
 			'identityClass' => 'common\models\xhWxOpenAdmin',
 			'enableAutoLogin' => true,
 			'identityCookie' => [
-				'name' => 'platformUser', // unique for platform
+				'name' => 'wwwUser', // unique for platform
 			],
 			'loginUrl' => ['main/login'],
 		],

biz/merchant/classes/MerchantClass.php

@@ -148,7 +148,7 @@ class MerchantClass extends BaseClass
 		$shopReturn = ShopClass::addShop($shopData);
 		$shopId = $shopReturn['id'];
 		//设置商家默认门店
-		MerchantClass::updateByCondition(['merchantId' => $merchantId], ['defaultShopId' => $shopId]);
+		MerchantClass::updateById($merchantId,['defaultShopId' => $shopId]);
 
 		//创建管理员角色
 		$hasRole = AdminRoleClass::getByCondition(['merchantId' => $merchantId, 'roleName' => '老板']);

console/controllers/UpgradeController.php

@@ -27,7 +27,7 @@ use yii\console\Controller;
 class UpgradeController extends Controller
 {
 	
-	//yii upgrade/init
+	// ./yii upgrade/init
 	public function actionInit()
 	{
 		if (getenv('YII_ENV') == 'dev') {