微信判断

app/business/controllers/BaseController.php

@@ -6,6 +6,7 @@ use biz\merchant\services\AdminService;
 use biz\merchant\services\MerchantAssetService;
 use biz\merchant\services\MerchantExtendService;
 use biz\merchant\services\MerchantService;
+use common\components\httpUtil;
 use common\components\jwt;
 use Yii;
 use common\components\util;
@@ -36,9 +37,12 @@ class BaseController extends PublicController
 		if ($this->validate == false) {
 			util::notLogin();
 		}
-		//$admin = AdminService::getById($adminId);
-		//授权方式获取客户信息 xhAdmin userId存的是每个公众号店长的微信userId
-		$admin = AdminService::getByCondition(['userId' => $adminId]);
+		if(httpUtil::isWx()){
+            //授权方式获取客户信息 xhAdmin userId存的是每个公众号店长的微信userId
+            $admin = AdminService::getByCondition(['userId' => $adminId]);
+        }else{
+            $admin = AdminService::getById($adminId);
+        }
 		if (empty($admin)) {
 			util::fail('没有找到管理员，但已经获取客户ID:' . $adminId);
 		}