|
@@ -19,15 +19,12 @@ class ActivityReward extends BaseController
|
|
|
];
|
|
];
|
|
|
$where = ActivityRewardService::getWhere($params);
|
|
$where = ActivityRewardService::getWhere($params);
|
|
|
$query = ActivityRewardModel::where($where);
|
|
$query = ActivityRewardModel::where($where);
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
- $sql = $query->toSql();
|
|
|
|
|
$list = $query->orderByDesc('id')->get()->toArray();
|
|
$list = $query->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) {
|
|
|
return $this->error($e->getMessage());
|
|
return $this->error($e->getMessage());
|
|
|
}
|
|
}
|
|
|
- return $this->success($sql);
|
|
|
|
|
|
|
+ return $this->success($list);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|