|
@@ -105,7 +105,7 @@ class WechatCommonService extends BaseService
|
|
$data = self::getUserInfo($app,$appid,$openId);
|
|
$data = self::getUserInfo($app,$appid,$openId);
|
|
$data['active_at'] = time();
|
|
$data['active_at'] = time();
|
|
}else{
|
|
}else{
|
|
- if ($info->uid == 0){
|
|
|
|
|
|
+ if ($info->uid == 0 && !empty($info->unionid)){
|
|
$data['uid'] = intval(DB::table('wechat_miniprogram_users')->where('unionid', $info->unionid)->value('id'));
|
|
$data['uid'] = intval(DB::table('wechat_miniprogram_users')->where('unionid', $info->unionid)->value('id'));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -148,7 +148,7 @@ class WechatCommonService extends BaseService
|
|
WechatOfficialUserInfo::updateOrCreate(['mp_openid' => $data['mp_openid'], 'gzh_appid' => $data['gzh_appid']], $data);
|
|
WechatOfficialUserInfo::updateOrCreate(['mp_openid' => $data['mp_openid'], 'gzh_appid' => $data['gzh_appid']], $data);
|
|
}else{
|
|
}else{
|
|
if (!is_empty($info)){
|
|
if (!is_empty($info)){
|
|
- if ($info->uid == 0){
|
|
|
|
|
|
+ if ($info->uid == 0 && !empty($info->unionid)){
|
|
$data['uid'] = intval(DB::table('wechat_miniprogram_users')->where('unionid', $info->unionid)->value('id'));
|
|
$data['uid'] = intval(DB::table('wechat_miniprogram_users')->where('unionid', $info->unionid)->value('id'));
|
|
}
|
|
}
|
|
WechatOfficialUserInfo::updateOrCreate(['mp_openid' => $data['mp_openid'], 'gzh_appid' => $data['gzh_appid']], $data);
|
|
WechatOfficialUserInfo::updateOrCreate(['mp_openid' => $data['mp_openid'], 'gzh_appid' => $data['gzh_appid']], $data);
|
|
@@ -173,7 +173,7 @@ class WechatCommonService extends BaseService
|
|
'is_subscribe' => $user['subscribe'],
|
|
'is_subscribe' => $user['subscribe'],
|
|
'subscribe_time' => $user['subscribe_time'],
|
|
'subscribe_time' => $user['subscribe_time'],
|
|
'subscribe_time_str' => get_date($user['subscribe_time']),
|
|
'subscribe_time_str' => get_date($user['subscribe_time']),
|
|
- 'uid' => intval(DB::table('wechat_miniprogram_users')->where('unionid', $user['unionid'])->value('id')),
|
|
|
|
|
|
+ 'uid' => !is_empty($user['unionid']) ? intval(DB::table('wechat_miniprogram_users')->where('unionid', $user['unionid'])->value('id')) : 0,
|
|
];
|
|
];
|
|
}
|
|
}
|
|
|
|
|