|
|
@@ -13,13 +13,10 @@ class ActivityReward extends BaseController
|
|
|
{
|
|
|
try {
|
|
|
$time = time();
|
|
|
- $params = [
|
|
|
+ $list = ActivityRewardModel::where(ActivityRewardService::getWhere([
|
|
|
'start_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) {
|
|
|
return $this->error($e->validator->errors()->first());
|
|
|
} catch (Exception $e) {
|