作品列表，增加登录用户今日剩余票数

application/api/controller/Subject.php

@@ -44,19 +44,9 @@ class Subject extends Api
             $map['title|suozaidanwei|tuijiangonghui'] = ['LIKE','%'.$keyword.'%'];
         }
 
+        //选手列表
         $lists = Db::name('vote_player')
-            ->where($map)->order('votes desc,id desc')->autopage()->select(); //选手不多，看看不加分页了，直接缓存10秒
-
-//        $button = 'answer';
-        //当前用户手里有票，按钮：投票
-        //用户手里没有票，但是今天还能答题，按钮：答题加票
-        /*$user_votes = Db::name('user_wallet')->where('user_id',$this->auth->id)->value('votes');
-        $user_question_count = Db::name('user_question_log')->where('user_id',$this->auth->id)->whereTime('createtime','today')->count('id');
-        $exam_times_user_eday = config('site.exam_times_user_eday');
-        if($user_votes == 0 && $user_question_count <= $exam_times_user_eday){
-            $button = 'answer';
-        }*/
-        //以上两者都没有，按钮：投票
+            ->where($map)->order('votes desc,id desc')->autopage()->select();
 
         foreach($lists as $key => $val){
             $val['video_file'] = localpath_to_netpath($val['video_file']);
@@ -66,14 +56,31 @@ class Subject extends Api
                 $val['video_thumb'] = $val['video_file'].'?x-oss-process=video/snapshot,t_0,m_fast,f_jpg';
             }
 
-//            $val['button'] = $button;
-
             $lists[$key] = $val;
         }
 
         //$lists = $this->mingci($subject_id,$lists);
 
-        $this->success(1,$lists);
+        //今日剩余票数
+        $today_my_vote = 0;
+        if($this->auth->isLogin()){
+            //今天,投了几票
+            $today_record = RedisUtil::getInstance(RedisKeyEnum::VOTE_RECORD.date('Y-m-d').':'.$this->auth->id)->get();
+            //今天,免费的的票
+            $gift_votes = config('site.gift_votes_user_eday');
+            //今天，用户答对的次数，也就是答题获得的票数
+            $question_vote  = RedisUtil::getInstance(RedisKeyEnum::EAXM_RIGHT.date('Y-m-d').':'.$this->auth->id)->get();
+            //今日剩余票数
+            $today_my_vote = $gift_votes + $question_vote - $today_record;
+        }
+
+        //
+        $result = [
+            'today_my_vote' => $today_my_vote,
+            'players'       => $lists,
+        ];
+
+        $this->success(1,$result);
     }
 
     //选手详情