|
@@ -266,11 +266,6 @@ class Index extends Controller
|
|
|
*/
|
|
*/
|
|
|
public function topRanking()
|
|
public function topRanking()
|
|
|
{
|
|
{
|
|
|
- $activity = Db::table('awards_activity')->where('begin_at', '<=', time())
|
|
|
|
|
- ->where('end_at', '>=', time())->find();
|
|
|
|
|
- if (empty($activity)) {
|
|
|
|
|
- return $this->response(5002, '活动末开始');
|
|
|
|
|
- }
|
|
|
|
|
|
|
|
|
|
$ranking = Db::table('awards_user_task_log')->alias("l")
|
|
$ranking = Db::table('awards_user_task_log')->alias("l")
|
|
|
->leftJoin('awards_user_info u', 'l.uid = u.uid')
|
|
->leftJoin('awards_user_info u', 'l.uid = u.uid')
|
|
@@ -307,11 +302,6 @@ class Index extends Controller
|
|
|
*/
|
|
*/
|
|
|
public function newRanking()
|
|
public function newRanking()
|
|
|
{
|
|
{
|
|
|
- $activity = Db::table('awards_activity')->where('begin_at', '<=', time())
|
|
|
|
|
- ->where('end_at', '>=', time())->find();
|
|
|
|
|
- if (empty($activity)) {
|
|
|
|
|
- return $this->response(5002, '活动末开始');
|
|
|
|
|
- }
|
|
|
|
|
|
|
|
|
|
$ranking = Db::table('awards_user_task_log')->alias("l")
|
|
$ranking = Db::table('awards_user_task_log')->alias("l")
|
|
|
->leftJoin('awards_user_info u', 'l.uid = u.uid')
|
|
->leftJoin('awards_user_info u', 'l.uid = u.uid')
|