脚踩星光列表

application/api/model/Room.php

@@ -3411,13 +3411,27 @@ class Room extends Model
         }
         $clear_time = db::name('vs_room_user_charm')->where(['room_id' => $room_id, 'user_id' => $user_id])
             ->order('id', 'desc')->value('clear_time') ?? 0;
-        $list = db::name('vs_give_gift')->alias('a')
-            ->join('user b', 'a.user_id=b.id')
-            ->field('a.user_id,sum(a.total_price) as total_price,b.nickname,b.avatar,b.user_code')
-            ->where(['a.from_id' => $room_id, 'a.gift_user' => $user_id, 'a.createtime' => ['>',$clear_time],'a.from' => 2])
-            ->group('a.user_id')->select();
+
+        if($clear_time > 0){
+            $stime = $clear_time;
+        }else{
+            //今天的开始时间
+            $stime = strtotime(date('Y-m-d'));
+        }
+
+        $params['from_id'] = $room_id;
+        $params['start_time'] = $stime;
+        $params['end_time'] = time();
+        $params['limit'] = 50;
+        $params['gift_user'] = $user_id;
+        $list = model('api/GiveGiftBases')->getToUserStatistics($params);
+
         if($list){
             foreach ($list as &$v){
+                $v['total_price'] = $v['total'];
+                $v['nickname'] = db::name('user')->where(['id' => $v['user_id']])->value('nickname');
+                $v['avatar'] = db::name('user')->where(['id' => $v['user_id']])->value('avatar');
+                $v['user_code'] = db::name('user')->where(['id' => $v['user_id']])->value('user_code');
                 $v['charm'] = $v['total_price'] * get_system_config_value('coin_charm_exp');
                 $v['icon'][0] = model('UserData')->user_wealth_icon($v['user_id']);//财富图标
                 $v['icon'][1] = model('UserData')->user_charm_icon($v['user_id']);//魅力图标