迁移

app-ghs/controllers/AuthController.php

@@ -400,7 +400,7 @@ class AuthController extends PublicController
         }
         $cacheKey = 'GHS_SHOP_MINI_SESSION_KEY_' . $openid;
         Yii::$app->redis->executeCommand('SET', [$cacheKey, $sessionKey]);
-        $admin = AdminService::getByMiniOpenId($openid);
+        $admin = AdminClass::getByCondition(['ghsMiniOpenId' => $openid]);
         if (empty($admin)) {
             //没有管理店铺不允许登录
             util::success(['token' => '', 'currentMiniOpenId' => $openid, 'number' => 3]);

app-hd/controllers/AuthController.php

@@ -443,7 +443,7 @@ class AuthController extends PublicController
             //没有管理店铺不允许登录
             util::success(['token' => '', 'currentMiniOpenId' => $openid]);
         }
-        $admin = AdminService::getByMiniOpenId($openid);
+        $admin = AdminService::getByCondition(['miniOpenId' => $openid]);
         if (empty($admin)) {
             //没有管理店铺不允许登录
             util::success(['token' => '', 'currentMiniOpenId' => $openid]);

biz-hd/user/classes/UserClass.php

@@ -157,6 +157,9 @@ class UserClass extends BaseClass
         if (isset($getUserInfo['miniOpenId']) && !empty($getUserInfo['miniOpenId'])) {
             $data['miniOpenId'] = $getUserInfo['miniOpenId'];
         }
+        if (isset($getUserInfo['ghsMiniOpenId']) && !empty($getUserInfo['ghsMiniOpenId'])) {
+            $data['ghsMiniOpenId'] = $getUserInfo['ghsMiniOpenId'];
+        }
         if (isset($getUserInfo['unionId']) && !empty($getUserInfo['unionId'])) {
             $data['unionId'] = $getUserInfo['unionId'];
         }

console/controllers/InitController.php

@@ -142,8 +142,9 @@ class InitController extends Controller
                         $pfAdminId = $staff['adminId'] ?? 0;
                         $pfAdmin = AdminClass::getById($pfAdminId, true);
                         if (!empty($pfAdmin)) {
-                            if(empty($pfAdmin->currentGhsShopId)){
+                            if (empty($pfAdmin->currentGhsShopId)) {
                                 $pfAdmin->currentGhsShopId = $pfShopId;
+                                $pfAdmin->ghsMiniOpenId = $pfAdmin->miniOpenId ?? '';
                                 $pfAdmin->save();
                             }
                         } else {
@@ -205,7 +206,7 @@ class InitController extends Controller
                         $adminId = $staff['adminId'] ?? 0;
                         $admin = AdminClass::getById($adminId, true);
                         if (!empty($admin)) {
-                            if(empty($admin->currentShopId)){
+                            if (empty($admin->currentShopId)) {
                                 $admin->currentShopId = $lsShopId;
                                 $admin->save();
                             }