|
|
@@ -2,8 +2,8 @@
|
|
|
|
|
|
namespace ghs\controllers;
|
|
|
|
|
|
-use biz\admin\services\ShopAdminService;
|
|
|
-use biz\admin\services\AdminService;
|
|
|
+use bizGhs\admin\services\ShopAdminService;
|
|
|
+use bizGhs\admin\services\AdminService;
|
|
|
use biz\auth\services\AuthService;
|
|
|
use biz\user\classes\UserClass;
|
|
|
use biz\wx\classes\WxOpenClass;
|
|
|
@@ -201,16 +201,13 @@ class AuthController extends PublicController
|
|
|
//用户来源
|
|
|
$userSource = UserClass::$userSourceId['mini']['name'];
|
|
|
$admin = AdminService::getByMiniOpenId($openid);
|
|
|
- $shopId = 0;
|
|
|
if (empty($admin)) {
|
|
|
$adminInfo = ['miniOpenId' => $openid];
|
|
|
$admin = AdminService::replaceAdmin($adminInfo, $userSource);
|
|
|
- $adminId = $admin['id'];
|
|
|
- } else {
|
|
|
- $adminId = $admin['id'];
|
|
|
- $relate = ShopAdminService::getByCondition(['adminId' => $adminId]);
|
|
|
- $shopId = isset($relate['shopId']) ? $relate['shopId'] : 0;
|
|
|
}
|
|
|
+ $adminId = $admin['id'];
|
|
|
+ $relate = ShopAdminService::getByCondition(['adminId' => $adminId]);
|
|
|
+ $shopId = isset($relate['shopId']) ? $relate['shopId'] : 0;
|
|
|
//头像
|
|
|
$admin['avatar'] = isset($admin['avatar']) && !empty($admin['avatar']) ? Yii::$app->params['imgHost'] . $admin['avatar'] : Yii::$app->params['imgHost'] . '/retail/default-img.png';
|
|
|
//管理员关联商家
|