diff --git a/app/Controller/Api/V1/Group/GiftController.php b/app/Controller/Api/V1/Group/GiftController.php index 57fd80894fde36bb350e4a07e2e19ceb24ce19f1..aba2eaa6829a6a24ada4bb57c2d075a25cf710f7 100644 --- a/app/Controller/Api/V1/Group/GiftController.php +++ b/app/Controller/Api/V1/Group/GiftController.php @@ -100,7 +100,7 @@ class GiftController extends CController } $idnum = data_get($v, 'id_num', ''); - $is_follow = 0; + $follow_status = 1; // 关注状态 if ($user_id) { $mine_id = data_get($v, 'mine_id', 0); @@ -109,7 +109,16 @@ class GiftController extends CController ->where('to_user_id',$mine_id) ->first(); if (!empty($follow_user)) { - $is_follow = 1; + $follow_status = 2; + } + if ($follow_status == 2) { + $to_follow_user = DB::table('user_follow') + ->where('to_user_id',$user_id) + ->where('user_id',$mine_id) + ->first(); + if (!empty($to_follow_user)) { + $follow_status = 3; + } } } @@ -118,7 +127,7 @@ class GiftController extends CController $idnums[$idnum]['points'] = '0'; $idnums[$idnum]['player_id'] = $playerId; $idnums[$idnum]['head_img'] = $headImg; - $idnums[$idnum]['is_follow'] = $is_follow; + $idnums[$idnum]['follow_status'] = $follow_status; if (!isset($idnums[$idnum]['order'])) { $idnums[$idnum]['order'] = $order; } @@ -130,7 +139,7 @@ class GiftController extends CController $idnums[$k]['points'] = empty($points)? 0: $points; $idnums[$k]['player_id'] = $playerId; $idnums[$k]['head_img'] = $headImg; - $idnums[$k]['is_follow'] = $is_follow; + $idnums[$k]['follow_status'] = $follow_status; $idnums[$k]['order'] = $order; $idnums[$k]['name'] = data_get($v, 'name'); } @@ -163,23 +172,34 @@ class GiftController extends CController foreach ($data as $k => $v) { $j = json_decode($v, true); - $model = Db::table('signups') - ->where('id', '=', $j['player_id']) - ->select('mine_id') - ->first(); -// - $is_follow = 0; -// // 关注状态 + $model = Players::where('players.id', '=', $j['player_id']) + ->leftjoin('signups as o', 'o.id', '=', 'players.sign_id') + ->select('o.mine_id') + ->first() + ->toArray(); + + $follow_status = 1; + // 关注状态 if ($user_id) { $follow_user = DB::table('user_follow') - ->where('user_id',$user_id) - ->where('to_user_id', data_get($model, 'mine_id')) + ->where('user_id', $user_id) + ->where('to_user_id', $model['mine_id']) ->first(); if (!empty($follow_user)) { - $is_follow = 1; + $follow_status = 2; } + if ($follow_status == 2) { + $to_follow_user = DB::table('user_follow') + ->where('to_user_id', $user_id) + ->where('user_id', $model['mine_id']) + ->first(); + if (!empty($to_follow_user)) { + $follow_status = 3; + } + } + } - $j['is_follow'] = $is_follow; + $j['follow_status'] = $follow_status; $return[] = $j; } } else { @@ -191,23 +211,34 @@ class GiftController extends CController foreach ($data as $k => $v) { $j = json_decode($v, true); - $model = Db::table('signups') - ->where('id', '=', $j['player_id']) - ->select('mine_id') - ->first(); -// - $is_follow = 0; -// // 关注状态 + $model = Players::where('players.id', '=', $j['player_id']) + ->leftjoin('signups as o', 'o.id', '=', 'players.sign_id') + ->select('o.mine_id') + ->first() + ->toArray(); + + $follow_status = 1; + // 关注状态 if ($user_id) { $follow_user = DB::table('user_follow') - ->where('user_id',$user_id) - ->where('to_user_id', data_get($model, 'mine_id')) + ->where('user_id', $user_id) + ->where('to_user_id', $model['mine_id']) ->first(); if (!empty($follow_user)) { - $is_follow = 1; + $follow_status = 2; } + if ($follow_status == 2) { + $to_follow_user = DB::table('user_follow') + ->where('to_user_id', $user_id) + ->where('user_id', $model['mine_id']) + ->first(); + if (!empty($to_follow_user)) { + $follow_status = 3; + } + } + } - $j['is_follow'] = $is_follow; + $j['follow_status'] = $follow_status; $return[] = $j; } } @@ -250,19 +281,6 @@ class GiftController extends CController if (empty($img)) { $rows[$k]['head_img'] = 'https://cdn.rockysports.cn/%E5%BE%AE%E6%AD%A5%E8%AE%A1%E6%97%B6.png'; } - - $is_follow = 0; - // 关注状态 - if ($user_id) { - $mine_id = data_get($v, 'mine_id', 0); - $follow_user = DB::table('user_follow') - ->where('user_id',$user_id) - ->where('to_user_id',$mine_id) - ->first(); - if (!empty($follow_user)) { - $is_follow = 1; - } - } } } diff --git a/app/Service/GiftService.php b/app/Service/GiftService.php index 87e391737b753f4156738b2e67d4d0caea8b128f..529cfc394928d987ed567022cc55d7a04c30e72a 100644 --- a/app/Service/GiftService.php +++ b/app/Service/GiftService.php @@ -107,8 +107,7 @@ class GiftService extends BaseService $headImg = 'https://cdn.rockysports.cn/%E5%BE%AE%E6%AD%A5%E8%AE%A1%E6%97%B6.png'; } $idnum = data_get($v, 'id_num', ''); - - $is_follow = 0; + $follow_status = 1; // 关注状态 if ($user_id) { $mine_id = data_get($v, 'mine_id', 0); @@ -117,7 +116,16 @@ class GiftService extends BaseService ->where('to_user_id',$mine_id) ->first(); if (!empty($follow_user)) { - $is_follow = 1; + $follow_status = 2; + } + if ($follow_status == 2) { + $to_follow_user = DB::table('user_follow') + ->where('to_user_id',$user_id) + ->where('user_id',$mine_id) + ->first(); + if (!empty($to_follow_user)) { + $follow_status = 3; + } } } if (!empty($idnum)) { @@ -125,7 +133,7 @@ class GiftService extends BaseService $idnums[$idnum]['points'] = 0; $idnums[$idnum]['player_id'] = $playerId; $idnums[$idnum]['head_img'] = $headImg; - $idnums[$idnum]['is_follow'] = $is_follow; + $idnums[$idnum]['follow_status'] = $follow_status; $idnums[$idnum]['name'] = data_get($v, 'name'); } $idnums[$idnum]['points'] += $points; @@ -133,7 +141,7 @@ class GiftService extends BaseService $idnums[$k]['points'] = empty($points)? 0: $points; $idnums[$k]['player_id'] = $playerId; $idnums[$k]['head_img'] = $headImg; - $idnums[$k]['is_follow'] = $is_follow; + $idnums[$k]['follow_status'] = $follow_status; $idnums[$k]['name'] = data_get($v, 'name'); } }