用户验证

app/mall/controllers/AuthController.php

@@ -21,153 +21,167 @@ use yii\helpers\Json;
  */
 class AuthController extends PublicController
 {
-
-    //准备授权 shish 2019.11.19
-    public function actionPrepare()
-    {
-        $get = Yii::$app->request->get();
-        $url = isset($get['url']) && !empty($get['url']) ? $get['url'] : '';
-        if (empty($url)) {
-            util::fail('没有网址');
-        }
-        $account = httpUtil::getAccount($url);
-        if (empty($account)) {
-            util::fail('没有商家帐号');
-        }
-        $merchant = MerchantService::getById($account);
-        if (empty($merchant)) {
-            util::fail('商家无效');
-        }
-        /**
-         * authScope 参数的说明
-         * 1.用户通过公众号菜单打开网页，因为已经关注过了公众号，已经生成过用户信息，所以只要使用snsapi_base静默方式拿到openid就可以
-         * 2.为了保证付款页的访问速度，暂时只要通过snsapi_base静默方式拿到openid先生成可以用的用户信息即可
-         * 3.其它情况需要获取用户完整信息的，使用snsapi_userinfo让用户授权获取信息即可
-         * 4.snsapi_base静默方式使用的场景更多，所以参数authScope默认使用snsapi_base
-         */
-        $authScope = isset($get['authScope']) ? $get['authScope'] : 'snsapi_base';
-        $urlEncode = stringUtil::urlSafeB64Encode($url);
-        //微信授权获取code shish 2019.11.24
-        wxUtil::getCode($urlEncode, $merchant, $authScope);
-        util::end();
-    }
-
-    //微信授权获取用户信息 shish 2019.11.20
-    public function actionGetUserInfo()
-    {
-        $get = Yii::$app->request->get();
-        $code = isset($get['code']) ? $get['code'] : '';
-        if (empty($code)) {
-            util::fail('没有获取用户code');
-        }
-        if (isset($get['state']) && $get['state'] == 'authdeny') {
-            util::fail('auth fail');
-        }
-        $urlEncode = $get['url'];
-        $url = stringUtil::urlSafeBase64Decode($urlEncode);
-        $account = httpUtil::getAccount($url);
-        if (empty($account)) {
-            util::stop('商店ID无效。');
-        }
-        $merchant = xhMerchantService::getByAccount($account);
-        if (empty($merchant)) {
-            util::stop('商店无效');
-        }
-        $merchantId = $merchant['id'];
-        $authScope = isset($get['authScope']) ? $get['authScope'] : '';
-        if (empty($authScope)) {
-            util::stop('没有授权类型');
-        }
-        $data = wxUtil::getOpenId($code, $merchant);
-        if ($data === false) {
-            //微信授权获取code shish 2019.11.24
-            wxUtil::getCode($urlEncode, $merchant, $authScope);
-            util::end();
-        }
-        $openId = $data['openid'];
-        $access_token = $data['access_token'];
-        $user = UserService::getByOpenId($openId, $merchantId);
-        //用户来源
-        $userSource = Yii::$app->dict->getValue('userSourceGetId', 'official');
-        $source = $userSource['name'];
-        if (empty($user)) {
-            //$authScope 默认是 snsapi_base 公众号菜单打开网页(已经关注公众号，有完整信息)、打开付款页(有些客户只付款，没有后续可以不用登记完整信息)，只需要获取openid
-            $originalInfo = [];
-            $originalInfo['openId'] = $openId;
-            $originalInfo['merchantId'] = $merchantId;
-
-            //没有关注公众号，需要获取用户完整信息的情况，则通过弹框授权
-            if ($authScope == 'snsapi_userinfo') {
-                $baseInfo = wxUtil::authGetUserInfo($openId, $access_token);
-                $originalInfo = array_merge($baseInfo, $originalInfo);
-                $originalInfo['isFull'] = 1;
-                $originalInfo['unionId'] = $baseInfo['unionid'];
-                $originalInfo['headImgUrl'] = $baseInfo['headimgurl'];
-                $originalInfo['nickName'] = $baseInfo['nickName'];
-            }
-            $user = UserService::replaceUser($originalInfo, $source, $merchantId);
-        } else {
-            if ($user['isFull'] == 0) {
-                if ($authScope == 'snsapi_userinfo') {
-                    $baseInfo = wxUtil::authGetUserInfo($openId, $access_token);
-                    $originalInfo = $baseInfo;
-                    $originalInfo['isFull'] = 1;
-                    $originalInfo['unionId'] = $baseInfo['unionid'];
-                    $originalInfo['headImgUrl'] = $baseInfo['headimgurl'];
-                    $originalInfo['openId'] = $baseInfo['openid'];
-                    $originalInfo['nickName'] = $baseInfo['nickName'];
-                    $originalInfo['merchantId'] = $merchantId;
-                    $user = UserService::replaceUser($originalInfo, $source, $merchantId);
-                }
-            }
-        }
-        //这个的基类没有设置统一的全局变量，这里进行设置一次
-        $userId = $user['id'];
-        //获取token
-        $token = jwt::getNewToken($userId);
-        $url = strpos($url, '?') === false ? $url . '?token=' . $token : $url . '&token=' . $token;
-        $this->redirect($url);
-    }
-
-    //静默获取小程序用户信息
-    public function actionMiniInfo()
-    {
-        $code = Yii::$app->request->get('code', '');
-        if (empty($code)) {
-            util::fail('没有CODE信息');
-        }
-        $merchant = $this->merchant;
-        $account = $this->merchantId;
-        $appId = $merchant['miniAppId'];
-        $appSecret = $merchant['miniAppSecret'];
-        if (empty($appSecret)) {
-            util::fail('没有找到小程序的密钥');
-        }
-        $url = "https://api.weixin.qq.com/sns/jscode2session?appid={$appId}&secret={$appSecret}&js_code={$code}&grant_type=authorization_code";
-
-        $curl = new curl\Curl();
-        $result = $curl->get($url);
-        $arr = Json::decode($result);
-        $sessionKey = isset($arr['session_key']) ? $arr['session_key'] : '';
-        $openid = isset($arr['openid']) ? $arr['openid'] : '';
-        if (empty($openid)) {
-            Yii::info(json_encode($arr));
-            util::fail('没有获取到小程序openId');
-        }
-        //用户来源
-        $userSource = UserClass::$userSourceId['mini']['name'];
-        $user = UserService::getByMiniOpenId($openid, $account);
-        if (empty($user)) {
-            $userInfo = ['miniOpenId' => $openid, 'merchantId' => $account];
-            Yii::info(json_encode($userInfo));
-            $user = UserService::replaceUser($userInfo, $userSource, $account);
-        }
-        $cacheKey = 'MALL_MINI_SESSION_KEY_' . $openid;
-        Yii::$app->redis->executeCommand('SET', [$cacheKey, $sessionKey]);
-        $userId = $user['id'];
-        $token = jwt::getNewToken($userId);
-        //update = 1 表示要求启动时更新（如果需要马上应用最新版本，可以使用 wx.getUpdateManager API 进行处理。）
-        util::success(['token' => $token, 'user' => $user, 'update' => 0]);
-    }
-
+	
+	//准备授权 shish 2019.11.19
+	public function actionPrepare()
+	{
+		$get = Yii::$app->request->get();
+		$url = isset($get['url']) && !empty($get['url']) ? $get['url'] : '';
+		if (empty($url)) {
+			util::fail('没有网址');
+		}
+		$account = httpUtil::getAccount($url);
+		if (empty($account)) {
+			util::fail('没有商家帐号');
+		}
+		$merchant = MerchantService::getById($account);
+		if (empty($merchant)) {
+			util::fail('商家无效');
+		}
+		/**
+		 * authScope 参数的说明
+		 * 1.用户通过公众号菜单打开网页，因为已经关注过了公众号，已经生成过用户信息，所以只要使用snsapi_base静默方式拿到openid就可以
+		 * 2.为了保证付款页的访问速度，暂时只要通过snsapi_base静默方式拿到openid先生成可以用的用户信息即可
+		 * 3.其它情况需要获取用户完整信息的，使用snsapi_userinfo让用户授权获取信息即可
+		 * 4.snsapi_base静默方式使用的场景更多，所以参数authScope默认使用snsapi_base
+		 */
+		$authScope = isset($get['authScope']) ? $get['authScope'] : 'snsapi_base';
+		$urlEncode = stringUtil::urlSafeB64Encode($url);
+		//微信授权获取code shish 2019.11.24
+		wxUtil::getCode($urlEncode, $merchant, $authScope);
+		util::end();
+	}
+	
+	//微信授权获取用户信息 shish 2019.11.20
+	public function actionGetUserInfo()
+	{
+		$get = Yii::$app->request->get();
+		$code = isset($get['code']) ? $get['code'] : '';
+		if (empty($code)) {
+			util::fail('没有获取用户code');
+		}
+		if (isset($get['state']) && $get['state'] == 'authdeny') {
+			util::fail('auth fail');
+		}
+		$urlEncode = $get['url'];
+		$url = stringUtil::urlSafeBase64Decode($urlEncode);
+		$account = httpUtil::getAccount($url);
+		if (empty($account)) {
+			util::stop('商店ID无效。');
+		}
+		$merchant = xhMerchantService::getByAccount($account);
+		if (empty($merchant)) {
+			util::stop('商店无效');
+		}
+		$merchantId = $merchant['id'];
+		$authScope = isset($get['authScope']) ? $get['authScope'] : '';
+		if (empty($authScope)) {
+			util::stop('没有授权类型');
+		}
+		$data = wxUtil::getOpenId($code, $merchant);
+		if ($data === false) {
+			//微信授权获取code shish 2019.11.24
+			wxUtil::getCode($urlEncode, $merchant, $authScope);
+			util::end();
+		}
+		$openId = $data['openid'];
+		$access_token = $data['access_token'];
+		$user = UserService::getByOpenId($openId, $merchantId);
+		//用户来源
+		$userSource = Yii::$app->dict->getValue('userSourceGetId', 'official');
+		$source = $userSource['name'];
+		if (empty($user)) {
+			//$authScope 默认是 snsapi_base 公众号菜单打开网页(已经关注公众号，有完整信息)、打开付款页(有些客户只付款，没有后续可以不用登记完整信息)，只需要获取openid
+			$originalInfo = [];
+			$originalInfo['openId'] = $openId;
+			$originalInfo['merchantId'] = $merchantId;
+			
+			//没有关注公众号，需要获取用户完整信息的情况，则通过弹框授权
+			if ($authScope == 'snsapi_userinfo') {
+				$baseInfo = wxUtil::authGetUserInfo($openId, $access_token);
+				$originalInfo = array_merge($baseInfo, $originalInfo);
+				$originalInfo['isFull'] = 1;
+				$originalInfo['unionId'] = $baseInfo['unionid'];
+				$originalInfo['headImgUrl'] = $baseInfo['headimgurl'];
+				$originalInfo['nickName'] = $baseInfo['nickName'];
+			}
+			$user = UserService::replaceUser($originalInfo, $source, $merchantId);
+		} else {
+			if ($user['isFull'] == 0) {
+				if ($authScope == 'snsapi_userinfo') {
+					$baseInfo = wxUtil::authGetUserInfo($openId, $access_token);
+					$originalInfo = $baseInfo;
+					$originalInfo['isFull'] = 1;
+					$originalInfo['unionId'] = $baseInfo['unionid'];
+					$originalInfo['headImgUrl'] = $baseInfo['headimgurl'];
+					$originalInfo['openId'] = $baseInfo['openid'];
+					$originalInfo['nickName'] = $baseInfo['nickName'];
+					$originalInfo['merchantId'] = $merchantId;
+					$user = UserService::replaceUser($originalInfo, $source, $merchantId);
+				}
+			}
+		}
+		//这个的基类没有设置统一的全局变量，这里进行设置一次
+		$userId = $user['id'];
+		//获取token
+		$token = jwt::getNewToken($userId);
+		$url = strpos($url, '?') === false ? $url . '?token=' . $token : $url . '&token=' . $token;
+		$this->redirect($url);
+	}
+	
+	//静默获取小程序用户信息
+	public function actionMiniInfo()
+	{
+		$code = Yii::$app->request->get('code', '');
+		if (empty($code)) {
+			util::fail('没有CODE信息');
+		}
+		$merchant = $this->merchant;
+		$account = $this->merchantId;
+		$appId = $merchant['miniAppId'];
+		$appSecret = $merchant['miniAppSecret'];
+		if (empty($appSecret)) {
+			util::fail('没有找到小程序的密钥');
+		}
+		$url = "https://api.weixin.qq.com/sns/jscode2session?appid={$appId}&secret={$appSecret}&js_code={$code}&grant_type=authorization_code";
+		
+		$curl = new curl\Curl();
+		$result = $curl->get($url);
+		$arr = Json::decode($result);
+		$sessionKey = isset($arr['session_key']) ? $arr['session_key'] : '';
+		$miniOpenId = isset($arr['openid']) ? $arr['openid'] : '';
+		if (empty($miniOpenId)) {
+			Yii::info(json_encode($arr));
+			util::fail('没有获取到小程序openId');
+		}
+		$unionId = isset($arr['unionid']) && !empty($arr['unionid']) ? $arr['unionid'] : '';
+		//先关注公众号或手动网页授权，小程序这边可以拿到unionId
+		if (!empty($unionId)) {
+			$user = UserService::getByUnionId($unionId);
+			if (empty($user['miniOpenId'])) {
+				$miniUser = UserService::getByMiniOpenId($miniOpenId);
+				if (!empty($miniUser)) {
+					$user = UserService::mergeUser($miniUser, $user);
+				} else {
+					$userId = $user['id'];
+					UserService::updateById($userId, ['miniOpenId' => $miniOpenId]);
+					$user['miniOpenId'] = $miniOpenId;
+				}
+			}
+		} else {
+			$user = UserService::getByMiniOpenId($miniOpenId);
+		}
+		if (empty($user)) {
+			$userInfo = ['miniOpenId' => $miniOpenId, 'merchantId' => $account, 'unionId' => $unionId];
+			$userSource = UserClass::$userSourceId['mini']['name'];
+			$user = UserService::replaceUser($userInfo, $userSource, $account);
+		}
+		$cacheKey = 'MALL_MINI_SESSION_KEY_' . $miniOpenId;
+		Yii::$app->redis->executeCommand('SET', [$cacheKey, $sessionKey]);
+		$userId = $user['id'];
+		$token = jwt::getNewToken($userId);
+		//update = 1 表示要求启动时更新（如果需要马上应用最新版本，可以使用 wx.getUpdateManager API 进行处理。）
+		util::success(['token' => $token, 'user' => $user, 'update' => 0]);
+	}
+	
 }

biz/user/classes/UserClass.php

@@ -215,9 +215,9 @@ class UserClass extends BaseClass
 		return $user;
 	}
 	
-	public static function getByMiniOpenId($miniOpenId, $merchantId)
+	public static function getByMiniOpenId($miniOpenId)
 	{
-		return self::getByCondition(['merchantId' => $merchantId, 'miniOpenId' => $miniOpenId]);
+		return self::getByCondition(['miniOpenId' => $miniOpenId]);
 	}
 	
 	public static function getByAlipayId($alipayId, $merchantId)
@@ -229,15 +229,13 @@ class UserClass extends BaseClass
 	{
 		return self::getByCondition(['merchantId' => $merchantId, 'openId' => $openId]);
 	}
-	
-	public static function getByUnionId($unionId, $merchantId)
+
+	public static function getByUnionId($unionId)
 	{
-		return self::getByCondition(['merchantId' => $merchantId, 'unionId' => $unionId]);
+		return self::getByCondition(['unionId' => $unionId]);
 	}
-	
-	/**
-	 * 合并用户
-	 */
+
+	//合并用户
 	public static function mergeUser($delUser, $retainUser)
 	{
 		$connection = Yii::$app->db;//事务处理
@@ -496,7 +494,7 @@ class UserClass extends BaseClass
 			case $userSource['mini']['name']:
 				$sourceId = $userSource['mini']['id'];
 				$miniOpenId = $userInfo['miniOpenId'];
-				$user = self::getByMiniOpenId($miniOpenId, $merchantId);
+				$user = self::getByMiniOpenId($miniOpenId);
 				break;
 			case $userSource['alipay']['name']:
 				$sourceId = $userSource['alipay']['id'];

biz/user/services/UserService.php

@@ -69,9 +69,14 @@ class UserService extends BaseService
 		return UserClass::getByOpenId($openId, $merchantId);
 	}
 	
-	public static function getByMiniOpenId($miniOpenId, $merchantId)
+	public static function getByMiniOpenId($miniOpenId)
 	{
-		return UserClass::getByMiniOpenId($miniOpenId, $merchantId);
+		return UserClass::getByMiniOpenId($miniOpenId);
+	}
+	
+	public static function getByUnionId($id)
+	{
+		return UserClass::getByUnionId($id);
 	}
 	
 	//同步微信用户 shish 2020.2.8
@@ -250,5 +255,11 @@ class UserService extends BaseService
 		UserIntegralService::increaseToUpgrade(0, $growth, 0, $userId, $merchantId, $extend);
 		return $user;
 	}
-	
+
+	//合并用户 shish 2020.5.12
+	public static function mergeUser($delUser, $retainUser)
+	{
+		return UserClass::mergeUser($delUser, $retainUser);
+	}
+
 }