加幸运币统计字段

application/adminapi/controller/Room.php

@@ -693,6 +693,8 @@ class Room extends adminApi
         $page = input('page', 1);
         $page_limit = input('page_limit', 10);
         $type = input('type', 1);//1:全部流水 2:日流水 3:周流水 4:月流水
+        $stime = input('stime', '');
+        $etime = input('etime', '');
         if($room_id == ''){
             return V(0,"参数错误");
         }
@@ -718,6 +720,19 @@ class Room extends adminApi
             $end_time  = time();
             $where['a.createtime'] = ['between', [$begin_time, $end_time]];
         }
+        if($stime != '' && $etime != ''){
+            $begin_time = strtotime($stime);
+            $end_time  = strtotime($etime);
+            $where['a.createtime'] = ['between', [$begin_time, $end_time]];
+        }elseif($stime != '' && $etime == ''){
+            $begin_time = strtotime($stime);
+            $end_time  = time();
+            $where['a.createtime'] = ['between', [$begin_time, $end_time]];
+        }elseif($etime != '' && $stime == ''){
+            $end_time  = strtotime($etime);
+            $where['a.createtime'] = ['<=', $etime];
+        }
+
         $count = db::name('vs_give_gift')->alias('a')
             ->field('a.id')
             ->join('user b', 'a.user_id = b.id', 'left')
@@ -747,6 +762,8 @@ class Room extends adminApi
 
             }
         }
+        //幸运流水总计
+        $total_lucky_coin = db::name('vs_room_luck_value')->where('room_id',$room_id)->where($where)->sum('luck_value');
         $return_data = [
             'page' =>$page,
             'page_limit' => $page_limit,
@@ -757,7 +774,8 @@ class Room extends adminApi
                     ->join('user b', 'a.user_id = b.id', 'left')
                     ->where('a.from',2)
                     ->where('a.from_id',$room_id)
-                    ->where($where)->sum('total_price')
+                    ->where($where)->sum('total_price'),
+                'total_lucky_coin' => $total_lucky_coin,
             ]
         ];
         return V(1,"成功", $return_data);