默认管理的门店

app/shop/controllers/AuthController.php

@@ -157,14 +157,14 @@ class AuthController extends PublicController
 		$adminShop = AdminShopService::getByCondition(['adminId' => $adminId]);
 		$merchantId = isset($adminShop['merchantId']) ? $adminShop['merchantId'] : 0;
 		$shopId = isset($adminShop['shopId']) ? $adminShop['shopId'] : 0;
-		if (empty($merchantId)) {
+		if (empty($shopId)) {
 			util::fail('您不是管理员');
 		}
 		//管理员关联门店
 		Yii::$app->redis->executeCommand('SET', ['LOGIN_ADMIN_SHOP' . $adminId, $shopId]);
 		//获取token
 		$token = jwt::getNewToken($adminId);
-		util::success(['token' => $token, 'account' => $merchantId, 'merchantId' => $merchantId]);
+		util::success(['token' => $token, 'account' => $merchantId, 'shopId' => $shopId]);
 	}
 	
 	//静默获取小程序用户信息

console/controllers/UpgradeController.php

@@ -1378,6 +1378,9 @@ ALTER TABLE `xhAdmin` DROP COLUMN `currentShopId`;";
 
         $sql = "RENAME TABLE xhAdminRelate TO xhAdminShop;";
 	    Yii::$app->db->createCommand($sql)->execute($sql);
+	    
+	    $sql = "ALTER TABLE `xhAdminShop` ADD `default` TINYINT NOT NULL DEFAULT 0 COMMENT '默认管理的门店 1是 0否' AFTER `roleId`;";
+	    Yii::$app->db->createCommand($sql)->execute($sql);
 
     }