diff --git a/application/api/model/Room.php b/application/api/model/Room.php index 49e54aa0..fac0e225 100644 --- a/application/api/model/Room.php +++ b/application/api/model/Room.php @@ -1880,10 +1880,10 @@ class Room extends Model if($type == 1){//1财富榜,2魅力榜 $res = model('api/GiveGiftBases')->getRoomGiftRanking($params, $type); - $list = $res['data']; + $list = $res; }else{ $res = model('api/GiveGiftBases')->getRoomGiftRanking($params, $type); - $list = $res['data']; + $list = $res; } if(isset($list)){ diff --git a/application/api/model/SendGift.php b/application/api/model/SendGift.php index 62bb3d19..8364d618 100644 --- a/application/api/model/SendGift.php +++ b/application/api/model/SendGift.php @@ -300,6 +300,25 @@ class SendGift extends Model //开出的礼物价值 $receive_gift_total += $gift_box[$i]['gift_price']; + + //使用收礼用户 和礼物ID 查询礼物墙 + $gift_wall = db::name('user_gift_wall')->where(['user_id'=>$to_uid,'gift_id'=>$gift_id])->find(); + if($gift_wall){ + db::name('user_gift_wall')->where(['id'=>$gift_wall['id']])->inc('count',1)->update(); + $userIds = explode(',',$gift_wall['give_user_ids']); + if(!in_array($uid,$userIds)){ + $userIds[] = $uid; + db::name('user_gift_wall')->where(['id'=>$gift_wall['id']])->update(['give_user_ids'=>implode(',',$userIds)]); + } + }else{ + db::name('user_gift_wall')->insert([ + 'user_id' => $to_uid, + 'gift_id' => $gift_id, + 'count' => 1, + 'give_user_ids' => $uid, + 'updatetime' => time() + ]); + } } if(!empty($gift_box_map)){ //拼接礼物字符串 (娃哈哈 * 2 / 娃哈哈1 * 1)这种格式 @@ -832,6 +851,25 @@ class SendGift extends Model 'count' => 1 ]; } + + //使用收礼用户 和礼物ID 查询礼物墙 + $gift_wall = db::name('user_gift_wall')->where(['user_id'=>$to_uid,'gift_id'=>$gift_id])->find(); + if($gift_wall){ + db::name('user_gift_wall')->where(['id'=>$gift_wall['id']])->inc('count',1)->update(); + $userIds = explode(',',$gift_wall['give_user_ids']); + if(!in_array($uid,$userIds)){ + $userIds[] = $uid; + db::name('user_gift_wall')->where(['id'=>$gift_wall['id']])->update(['give_user_ids'=>implode(',',$userIds)]); + } + }else{ + db::name('user_gift_wall')->insert([ + 'user_id' => $to_uid, + 'gift_id' => $gift_id, + 'count' => 1, + 'give_user_ids' => $uid, + 'updatetime' => time() + ]); + } } if(!empty($gift_box_map)){ //拼接礼物字符串 (娃哈哈 * 2 / 娃哈哈1 * 1)这种格式