Ken 1 周之前
父节点
当前提交
996971a532
共有 1 个文件被更改,包括 2 次插入5 次删除
  1. 2 5
      app/Http/Controllers/api/ActivityReward.php

+ 2 - 5
app/Http/Controllers/api/ActivityReward.php

@@ -13,13 +13,10 @@ class ActivityReward extends BaseController
     {
     {
         try {
         try {
             $time = time();
             $time = time();
-            $params = [
+            $list = ActivityRewardModel::where(ActivityRewardService::getWhere([
                 'start_time' => ['<=', $time],
                 'start_time' => ['<=', $time],
                 'end_time' => ['>=', $time],
                 'end_time' => ['>=', $time],
-            ];
-            $where = ActivityRewardService::getWhere($params);
-            $query = ActivityRewardModel::where($where);
-            $list = $query->orderByDesc('id')->get()->toArray();
+            ]))->orderByDesc('id')->get()->toArray();
         } catch (ValidationException $e) {
         } catch (ValidationException $e) {
             return $this->error($e->validator->errors()->first());
             return $this->error($e->validator->errors()->first());
         } catch (Exception $e) {
         } catch (Exception $e) {