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