replaceUser

app/mall/controllers/AuthController.php

@@ -21,171 +21,151 @@ 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'] : '';
+		$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'] : '';
 
-    //准备授权 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)) {
-                if (isset($user['miniOpenId']) && 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]);
-    }
+		$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

@@ -37,6 +37,9 @@ class UserClass extends BaseClass
 		0 => ['name' => 'official', 'title' => '公众号'],
 		1 => ['name' => 'alipay', 'title' => '支付宝'],
 		2 => ['name' => 'mini', 'title' => '小程序'],
+		3 => ['name' => 'friend', 'title' => '朋友圈'],
+		4 => ['name' => 'meituan', 'title' => '美团'],
+		5 => ['name' => 'system', 'title' => '系统'],
 	];
 	
 	//用户来源分类ID
@@ -44,6 +47,9 @@ class UserClass extends BaseClass
 		'official' => ['id' => 0, 'name' => 'official'],
 		'alipay' => ['id' => 1, 'name' => 'alipay'],
 		'mini' => ['id' => 2, 'name' => 'mini'],
+		'friend' => ['id' => 3, 'name' => 'friend'],
+		'meituan' => ['id' => 4, 'name' => 'meituan'],
+		'system' => ['id' => 5, 'name' => 'system'],
 	];
 	
 	//组合客户基本和资产信息
@@ -439,7 +445,7 @@ class UserClass extends BaseClass
 		$openId = '';
 		if (isset($info['openid']) && !empty($info['openid'])) {
 			$openId = $info['openid'];
-			unset($info['openId']);
+			unset($info['openid']);
 		}
 		if (isset($info['openId']) && !empty($info['openId'])) {
 			$openId = $info['openId'];
@@ -458,6 +464,9 @@ class UserClass extends BaseClass
 				
 			}
 		}
+		if (isset($info['miniOpenId'])) {
+			$info['miniOpenId'] = $info['miniOpenId'];
+		}
 		if (isset($info['nickName'])) {
 			$info['userName'] = $info['nickName'];
 			$info['nickName'] = $info['nickName'];
@@ -506,7 +515,7 @@ class UserClass extends BaseClass
 				break;
 			case $userSource['official']['name']:
 				$sourceId = $userSource['official']['id'];
-				//老客添加没有openId
+				//后台添加的客户没有openId
 				$openId = isset($userInfo['openId']) ? $userInfo['openId'] : '';
 				$user = [];
 				if (!empty($openId)) {
@@ -516,37 +525,31 @@ class UserClass extends BaseClass
 			default:
 				throw new \Exception('未知来源的用户');
 		}
+		
+		//支付宝暂时获取不到很多客户信息不进行更新
+		if ($source == $userSource['alipay']['name']) {
+			if (!empty($user)) {
+				return $user;
+			}
+		}
 		if (empty($user)) {
 			if (!empty($unionUser)) {
-				//如在小程序端已经授权用户信息和unionId之后，关注公众号会走这里
+				//1、在小程序端已经授权用户信息和unionId之后，关注公众号时走这里
+				//2、关注了公众号或者H5已经授权时，并首次访问小程序
 				$user = self::updateUser($unionUser, $userInfo, $merchantId);
 			} else {
 				$userInfo['source'] = $sourceId;
 				$userInfo['merchantId'] = $merchantId;
 				$user = self::generateUser($userInfo, $merchantId);
 			}
-			
 		} else {
-			//支付宝付款时不需要每次更新用户信息
-			if ($source != $userSource['alipay']['name']) {
-				$user = self::updateUser($user, $userInfo, $merchantId);
-			}
-		}
-		$userId = $user['id'];
-		//存在相同unionId则进行合并
-		$unionId = isset($userInfo['unionId']) ? $userInfo['unionId'] : '';
-		if (!empty($unionId)) {
-			$sameUser = self::getSameUnionId($unionId);
-			if (count($sameUser) == 2) {
-				foreach ($sameUser as $id => $currentUser) {
-					if ($id == $userId) {
-						$retainUser = $currentUser;
-					} else {
-						$delUser = $currentUser;
-					}
+			if (!empty($unionUser)) {
+				if (isset($unionUser['id']) && isset($user['id']) && $user['id'] != $unionUser['id']) {
+					//合并相同客户
+					$user = self::mergeUser($unionUser, $user);
 				}
-				$user = self::mergeUser($delUser, $retainUser);
 			}
+			$user = self::updateUser($user, $userInfo, $merchantId);
 		}
 		return $user;
 	}

console/controllers/UpgradeController.php

@@ -1409,7 +1409,7 @@ ALTER TABLE `xhStatOrderMonth` ADD shopId INT NOT NULL DEFAULT 0 COMMENT '门店
 ALTER TABLE `xhStatOut` ADD shopId INT NOT NULL DEFAULT 0 COMMENT '门店id' AFTER merchantId;
 ALTER TABLE `xhStatOutMonth` ADD shopId INT NOT NULL DEFAULT 0 COMMENT '门店id' AFTER merchantId;";
 		Yii::$app->db->createCommand($sql)->execute($sql);
-
+		
 		$sql = "ALTER TABLE `xhApply` MODIFY `introMerchantId`  INT NOT NULL DEFAULT 0 COMMENT '引荐花店';
 ALTER TABLE `xhApply` CHANGE `userId` `adminId` INT NOT NULL DEFAULT 0 COMMENT '申请人';";
 		Yii::$app->db->createCommand($sql)->execute($sql);
@@ -1417,21 +1417,25 @@ ALTER TABLE `xhApply` CHANGE `userId` `adminId` INT NOT NULL DEFAULT 0 COMMENT '
 		$sql = "ALTER TABLE `xhMerchantExtend` MODIFY `alipayKey` VARCHAR(5000) NOT NULL DEFAULT '' COMMENT '商户密钥';
 ALTER TABLE `xhMerchantExtend` MODIFY `alipayPublicKey` VARCHAR(5000) NOT NULL DEFAULT '' COMMENT '支付宝公钥';";
 		Yii::$app->db->createCommand($sql)->execute($sql);
-
+		
 		$sql = "ALTER TABLE `xhCouponAsset` MODIFY `switch` TINYINT NOT NULL DEFAULT 1 COMMENT '新客注册会员送券 1开启 0关闭';";
 		Yii::$app->db->createCommand($sql)->execute($sql);
-
+		
 		$sql = "ALTER TABLE `xhGoods` MODIFY `stock` INT NOT NULL DEFAULT -1 COMMENT '库存 -1充足';UPDATE `xhGoods` SET stock=-1;ALTER TABLE `xhGoods` DROP INDEX `itemNumber`;";
-        Yii::$app->db->createCommand($sql)->execute($sql);
-
-        $sql = "ALTER TABLE `xhUser` CHANGE `nickname` `nickName` VARCHAR(50) NOT NULL DEFAULT '' COMMENT '昵称';
+		Yii::$app->db->createCommand($sql)->execute($sql);
+		
+		$sql = "ALTER TABLE `xhUser` CHANGE `nickname` `nickName` VARCHAR(50) NOT NULL DEFAULT '' COMMENT '昵称';
 ALTER TABLE `xhAdmin` CHANGE `nickname` `nickName` VARCHAR(50) NOT NULL DEFAULT '' COMMENT '昵称';";
-        Yii::$app->db->createCommand($sql)->execute($sql);
-
-        $sql = "ALTER TABLE `xhOrder` ADD `wxPayType` TINYINT NOT NULL DEFAULT 0 COMMENT '微信支付的细分 0 H5支付 1 小程序支付' AFTER `payWay`;";
+		Yii::$app->db->createCommand($sql)->execute($sql);
+		
+		$sql = "ALTER TABLE `xhOrder` ADD `wxPayType` TINYINT NOT NULL DEFAULT 0 COMMENT '微信支付的细分 0 H5支付 1 小程序支付' AFTER `payWay`;";
+		Yii::$app->db->createCommand($sql)->execute($sql);
+		
+		$sql = "ALTER TABLE `xhUser` MODIFY `sourceType` TINYINT NOT NULL DEFAULT 0 COMMENT '来源 0微信 1支付宝 2小程序 3朋友圈 4美团 5系统，订单和客户来源id尽量统一';
+ALTER TABLE `xhOrder` MODIFY `sourceType` TINYINT NOT NULL DEFAULT 0 COMMENT '来源 0微信 1支付宝 2小程序 3朋友圈 4美团 5系统，订单和客户来源id尽量统一';";
 		Yii::$app->db->createCommand($sql)->execute($sql);
 	}
-
+	
 	//数据迁移 shish 2020.1.12
 	//./yii upgrade/sync
 	public function actionSync()
@@ -1558,7 +1562,7 @@ ALTER TABLE `xhAdmin` CHANGE `nickname` `nickName` VARCHAR(50) NOT NULL DEFAULT
 		$merchant = WxOpenService::getWxInfo();
 		xhWxMenuService::applyInit($merchant, 1);
 	}
-
+	
 	//测试生成头像有没问题
 	public function actionAddAvatar($id)
 	{