员工报错问题

app/shop/controllers/AuthController.php

@@ -161,8 +161,6 @@ class AuthController extends PublicController
 		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, 'shopId' => $shopId]);
@@ -201,6 +199,8 @@ class AuthController extends PublicController
 			$adminInfo = ['miniOpenId' => $openid];
 			$admin = AdminService::replaceAdmin($adminInfo, $userSource);
 			$adminId = $admin['id'];
+		} else {
+			$adminId = $admin['id'];
 		}
 		$shopId = $admin['currentShopId'] ?? 0;
 		$shopAdminId = 0;
@@ -211,8 +211,6 @@ class AuthController extends PublicController
 		//头像
 		$avatar = isset($admin['avatar']) && !empty($admin['avatar']) ? Yii::$app->params['imgHost'] . $admin['avatar'] : Yii::$app->params['imgHost'] . '/retail/default-img.png';
 		$admin['avatar'] = $avatar;
-		//管理员关联商家
-		Yii::$app->redis->executeCommand('SET', ['LOGIN_ADMIN_SHOP' . $adminId, $shopId]);
 		$token = jwt::getNewToken($adminId);
 		util::success(['token' => $token, 'admin' => $admin, 'shopId' => $shopId, 'shopAdminId' => $shopAdminId]);
 	}

sql.sql

@@ -1294,4 +1294,5 @@ DROP TABLE IF EXISTS xhAdminLog;
 ALTER TABLE xhGhsAdmin RENAME TO xhAdmin;
 ALTER TABLE xhGhsAdminRole RENAME TO xhAdminRole;
 ALTER TABLE xhGhsAdminRoleAuth RENAME TO xhAdminRoleAuth;
-ALTER TABLE xhGhsAdminLog RENAME TO xhAdminLog;
+ALTER TABLE xhGhsAdminLog RENAME TO xhAdminLog;
+ALTER TABLE `xhAdmin` MODIFY `identity` TINYINT(4) NOT NULL DEFAULT '0' COMMENT '身份 0未知 1客户(跳转到最近访问店铺) 2员工';