|
|
@@ -102,7 +102,7 @@ class Applet extends Base
|
|
|
} else {
|
|
|
# 判断用户是否存在，是否需要合并
|
|
|
$uid = $info['uid'];
|
|
|
- //$uid = $this->combine($info['uid'], $data['unionid']);
|
|
|
+ $uid = $this->combine($info['uid'], $data['unionid']);
|
|
|
}
|
|
|
$wechat['unionid'] = $data['unionid'];
|
|
|
}
|
|
|
@@ -129,7 +129,7 @@ class Applet extends Base
|
|
|
if (isset($data['unionid']) && $data['unionid']) {
|
|
|
//$wechat['unionid'] = $data['unionid'];
|
|
|
# 判断用户是否存在，是否需要合并
|
|
|
- //$wechat['uid'] = $this->combine($uid, $data['unionid']);
|
|
|
+ $wechat['uid'] = $this->combine($uid, $data['unionid']);
|
|
|
}
|
|
|
$id = $info['id'];
|
|
|
$wechat['session_key'] = $data['session_key'];
|
|
|
@@ -176,7 +176,7 @@ class Applet extends Base
|
|
|
}
|
|
|
|
|
|
if ($mobile && $phoneNumber && $uid) {
|
|
|
- //$uid = $this->combine($uid, $mobile, 'mobile');
|
|
|
+ $uid = $this->combine($uid, $mobile, 'mobile');
|
|
|
|
|
|
$info = Dever::load('passport/user-one', $uid);
|
|
|
$result['mobile'] = $mobile;
|
|
|
@@ -239,7 +239,7 @@ class Applet extends Base
|
|
|
Dever::load('passport/wechat-update', $wechat);
|
|
|
} elseif ($vinfo && $vinfo['id'] != $vid) {
|
|
|
$wechat['set_unionid'] = $unionid;
|
|
|
- //$uid = $this->combine($uid, $unionid);
|
|
|
+ $uid = $this->combine($uid, $unionid);
|
|
|
$wechat['set_uid'] = $uid;
|
|
|
$wechat['where_id'] = $vid;
|
|
|
Dever::load('passport/wechat-update', $wechat);
|
dever