|
|
@@ -167,7 +167,6 @@ class MemberService extends BaseService
|
|
|
$unionid = isset($userInfo['unionid']) ? $userInfo['unionid'] : '';
|
|
|
$sessionKey = isset($userInfo['session_key']) ? $userInfo['session_key'] : '';
|
|
|
$accessToken = isset($userInfo['access_token']) ? $userInfo['access_token'] : '';
|
|
|
- var_dump($userInfo);
|
|
|
if (empty($userInfo)) {
|
|
|
$this->error = MpService::make()->getError();
|
|
|
return false;
|
|
|
@@ -212,7 +211,7 @@ class MemberService extends BaseService
|
|
|
$userAvatar = isset($data['avatar']) ? $data['avatar'] : '';
|
|
|
$nickName = isset($data['nickname']) ? $data['nickname'] : '';
|
|
|
$mobile = isset($data['mobile']) ? $data['mobile'] : '';
|
|
|
- $unionid = isset($data['unionid']) ? $data['unionid'] : '';
|
|
|
+ $userUnionid = isset($data['unionid']) ? $data['unionid'] : '';
|
|
|
$status = isset($data['status']) ? $data['status'] : 0;
|
|
|
$mark = isset($data['mark']) ? $data['mark'] : 0;
|
|
|
if ($data && $userId && $status != 1 && $mark == 1) {
|
|
|
@@ -242,6 +241,7 @@ class MemberService extends BaseService
|
|
|
$data = [
|
|
|
'nickname' => $nickname? $nickname : '用户' . $userId,
|
|
|
'openid' => $openid,
|
|
|
+ 'unionid' => $unionid,
|
|
|
'mobile' => '',
|
|
|
'avatar' => $avatar,
|
|
|
'parent_id' => $rid,
|
|
|
@@ -276,6 +276,10 @@ class MemberService extends BaseService
|
|
|
$updateData['openid'] = $openid;
|
|
|
}
|
|
|
|
|
|
+ if($unionid) {
|
|
|
+ $updateData['unionid'] = $unionid;
|
|
|
+ }
|
|
|
+
|
|
|
if(empty($userAvatar) && $avatar){
|
|
|
$updateData['avatar'] = $avatar;
|
|
|
}
|
