|
@@ -349,25 +349,31 @@ class CoflController extends Controller
|
|
|
* @return array
|
|
|
*/
|
|
|
private function getUsersV2($openid){
|
|
|
- $friend_link_uid_bind = DB::table('friend_link_uid_bind')->where('openid',$openid)->first();
|
|
|
+ $friend_link_uid_bind = DB::table('friend_link_uid_bind')->where('openid',$openid)->orderBy('id','desc')->first();
|
|
|
if($friend_link_uid_bind) {
|
|
|
$user = User::where('id',$friend_link_uid_bind->uid)->select('id','distribution_channel_id')->first();
|
|
|
if($user) {
|
|
|
- \Log::info('user;'.json_encode($user));
|
|
|
-
|
|
|
return [$user->id,$user->distribution_channel_id];
|
|
|
}
|
|
|
}
|
|
|
//外部渠道导粉
|
|
|
- if(Redis::Hexists('crm:out_guide_exposure_user',$openid)){
|
|
|
+ if(Redis::hget('crm:out_guide_exposure_user',$openid)){
|
|
|
+ Log::info('------------getUsersV2-outer---start--------------------------------');
|
|
|
+ Log::info('getUsersV2 $openid is:'.$openid);
|
|
|
$user = $this->createUser($openid,$openid,5204,0,'');
|
|
|
+ Log::info('$user = $this->createUser($openid,$openid,5204,0):');
|
|
|
+ Log::info($user);
|
|
|
$uid = $user->id;
|
|
|
$distribution_channel_id = 5204;
|
|
|
$ouid = Redis::hget('crm:out_guide_exposure_user',$openid);
|
|
|
+ Log::info('$ouid is :'.$ouid);
|
|
|
UserService::transfer($ouid,$uid,5204);
|
|
|
$insert_data = ['uid'=>$uid,'openid'=>$openid ,'created_at'=>date('Y-m-d H:i:s'),'updated_at'=>date('Y-m-d H:i:s')];
|
|
|
DB::table('friend_link_uid_bind')->insert($insert_data);
|
|
|
+
|
|
|
Redis::del('crm:out_guide_exposure_user',$openid);
|
|
|
+ Log::info([$uid,$distribution_channel_id]);
|
|
|
+ Log::info('------------getUsersV2-outer---end--------------------------------');
|
|
|
return [$uid,$distribution_channel_id];
|
|
|
}
|
|
|
$inner_channels = Channel::join('channel_users','channel_users.id','=','distribution_channels.channel_user_id')
|
|
@@ -921,6 +927,10 @@ class CoflController extends Controller
|
|
|
}
|
|
|
|
|
|
private function createUser($openid,$unionid,$distribution_channel_id,$send_order_id,$ip){
|
|
|
+ $user = UserService::getUserByOpenidAndChannelId($openid,$distribution_channel_id);
|
|
|
+ if($user){
|
|
|
+ return $user;
|
|
|
+ }
|
|
|
$user = null;
|
|
|
try{
|
|
|
$user = UserService::addUser(
|