管理后台-礼盒管理-礼盒领取记录

application/adminapi/controller/Activities.php

@@ -675,23 +675,43 @@ class Activities extends adminApi
         $page_limit = input('page_limit', 30);
         $user_id = input('user_id', '');
         $gift_bag_id = input('gift_bag_id', 1);
+        $begin_time = input('begin_time', '');
+        $end_time = input('end_time', '');
         $where = [];
         if($user_id){
-            $where['user_id'] = $user_id;
+            $where['a.user_id'] = $user_id;
         }
         if($gift_bag_id){
-            $where['gift_bag_id'] = $gift_bag_id;
+            $where['a.gift_bag_id'] = $gift_bag_id;
         }
-        $count = db::name('vs_gift_bag_receive_log')->where($where)->count();
+        if($begin_time){
-        $lists_data = db::name('vs_gift_bag_receive_log')->where($where)->page($page, $page_limit)->order("id desc")->select();
+            $where['a.createtime'] = ['>=', strtotime($begin_time)];
+        }
+        if($end_time){
+            $where['a.createtime'] = ['<=', strtotime($end_time)];
+        }
+        if($begin_time && $end_time){
+            $where['a.createtime'] = ['between', [strtotime($begin_time), strtotime($end_time)]];
+        }
+        $count = db::name('vs_gift_bag_receive_log')->alias('a')->where($where)->count();
+        $lists_data = db::name('vs_gift_bag_receive_log')
+            ->alias('a')
+            ->join('vs_gift_bag_detail b', 'a.parent_id=b.id')
+            ->join('vs_gift c', 'a.gift_id=c.gid')
+            ->field('a.*,b.name,b.type,b.quantity,b.foreign_id,c.gift_price,b.name')
+            ->where($where)->page($page, $page_limit)->order("id desc")->select();
         $lists = [];
         foreach ($lists_data as $key => $value) {
             $gift_bag = db::name('vs_gift_bag')->where('id',$value['gift_bag_id'])->find();
+            $user = db::name('user')->where('id',$value['user_id'])->find();
             $lists[$key]['id'] = $value['id'];
             $lists[$key]['user_id'] = $value['user_id'];
-            $lists[$key]['user_name'] = $value['user_id'].'-'.db::name('user')->where('id',$value['user_id'])->value('nickname');
+            $lists[$key]['user_name'] = $user['user_code'].'-'.$user['nickname'];
             $lists[$key]['gift_bag_type'] = db::name('vs_gift_bag')->where('id',$value['gift_bag_id'])->value('name');
             $lists[$key]['money'] = $gift_bag['money'];
+            //礼物
+            $lists[$key]['gift'] = $value['name']."*".$value['quantity'];
+            $lists[$key]['gift_price'] = $value['gift_price'] * $value['quantity'];
             $lists[$key]['createtime'] = date('Y-m-d H:i:s',$value['createtime']);
         }
         $return_data = [

application/adminapi/controller/Decorate.php

@@ -384,7 +384,7 @@ class Decorate extends adminApi
                 $return_list[$k]['name'] = db::name('vs_decorate')->where(['did'=>$v['did']])->value('title');
             }
             if(in_array($v['type'],[12,13])){
-                $return_list[$k]['name'] = $return_list[$k]['name'] ." * ".$v['num']."张";
+                $return_list[$k]['name'] = $return_list[$k]['name'] ." * ".$v['num']." 张";
             }
             $return_list[$k]['base_image'] = db::name('vs_decorate')->where(['did'=>$v['did']])->value('base_image');
             $return_list[$k]['is_using'] = $v['is_using'];

application/api/model/UserWallet.php

@@ -238,7 +238,7 @@ class UserWallet extends Model
     public function change_user_cion_log($user_id,$money,$room_id,$change_type,$remarks)
     {
         //增加用户金币类型
-        $in_types = [2,5,6,8,13,14,15,16,23,26,27,28,30,33,35,40,51,57,58];
+        $in_types = [2,5,6,8,13,14,15,16,23,26,27,28,30,33,35,40,51,57,58,44];
         //减少用户金币类型
         $out_types = [4,7,10,17,20,24,25,32,42,50,56,59];