任务bug修改

application/api/model/Tasks.php

@@ -324,9 +324,6 @@ class Tasks extends Model
         }else{
             $user_daily_tasks = Db::name('vs_tasks_user_daily')->where('user_id',$user_id)->where('task_id',$task_id)->find();
         }
-        if ($user_daily_tasks && $user_daily_tasks['is_completed'] == 1) {
-            return ['code' => 0, 'msg' => '您已完成该任务','data' => null];
-        }
         $is_completed = 0;
         $completion_time = null;
         if(in_array($task_id,[21,22,23])){
@@ -355,8 +352,12 @@ class Tasks extends Model
                 }
                 $task_student_data['is_reward'] = 1;
             }
+            $task_student_data['updatetime'] = time();
             $reslut = Db::name('vs_tasks_student')->where('id',$task_student['id'])->update($task_student_data);
         }else{
+            if ($user_daily_tasks && $user_daily_tasks['is_completed'] == 1) {
+                return ['code' => 0, 'msg' => '您已完成该任务','data' => null];
+            }
             if ($user_daily_tasks) {
                 if($user_daily_tasks['current_progress'] > $task_info['target_quantity']){
                     $current_progress = $task_info['target_quantity'];

application/cron/controller/Subsidy.php

@@ -59,11 +59,12 @@ class Subsidy
                 }
                 $transaction_one = db::name('vs_give_gift')
                     ->whereIn('from_id',$v['room_id'])
-                    ->where(['from'=>['in',[2,3,6]],'createtime' => ['between', [$week_start_time_seach, $week_end_time_seach]]])
+                    ->where(['from'=>2])
+                    ->where(['createtime'=>['>=',$week_start_time_seach]])
+                    ->where(['createtime'=>['<',$week_end_time_seach]])
                     ->sum('total_price');
                 $transaction += $transaction_one;
             }
-
             if($transaction > 0){
                 //判断是否已经生成过
                 if (db::name('vs_guild_subsidy')->where(['guild_id'=>$value['id'],'week'=>$time_value])->find()) {

application/guildadmin/controller/Room.php

@@ -77,7 +77,7 @@ class Room extends GuildAdmin
             ->join('vs_room b', 'a.room_id = b.id', 'left')
             ->field('a.*,b.room_name,b.room_number,b.room_cover,b.type_id,b.label_id,b.room_status')
             ->where($where)
-            ->page($page, $page_limit)
+//            ->page($page, $page_limit)
             ->select();
         $rum_lists = [];
         //总流水