diff --git a/doc/Ranking.py b/doc/Ranking.py index b68aef0f..b166c91c 100644 --- a/doc/Ranking.py +++ b/doc/Ranking.py @@ -19,5 +19,18 @@ class Ranking(object): _common.RspHead(), ['ranking_list', _common.RankingList(), '排行榜数据'] ] + }, + { + 'name': 'activityRankingList', + 'desc': '获取内试活动排行榜', + 'group': 'Ranking', + 'url': 'webapp/index.php?c=Ranking&a=activityRankingList', + 'params': [ + _common.ReqHead(), + ], + 'response': [ + _common.RspHead(), + ['ranking_list', _common.RankingList(), '排行榜数据'] + ] } ] diff --git a/webapp/controller/RankingController.class.php b/webapp/controller/RankingController.class.php index d7f28643..f0220547 100644 --- a/webapp/controller/RankingController.class.php +++ b/webapp/controller/RankingController.class.php @@ -72,4 +72,13 @@ class RankingController extends BaseAuthedController { )); } + public function activityRankingList() + { + } + + private function internalGetActivityRankList($type) + { + + } + } diff --git a/webapp/mt/RankActivity.php b/webapp/mt/RankActivity.php index cdf18ae6..64bc46c5 100644 --- a/webapp/mt/RankActivity.php +++ b/webapp/mt/RankActivity.php @@ -13,8 +13,8 @@ class RankActivity { public static function isActivityPeriod($meta) { - return $meta['opentime'] >= myself()->_getNowTime() && - $meta['closetime'] < myself()->_getNowTime(); + return myself()->_getNowTime() >= $meta['opentime'] && + myself()->_getNowTime() < $meta['closetime']; } protected static function getMetaList() diff --git a/webapp/services/RankActivityService.php b/webapp/services/RankActivityService.php index 1d324b66..2ef5da28 100644 --- a/webapp/services/RankActivityService.php +++ b/webapp/services/RankActivityService.php @@ -46,7 +46,7 @@ class RankActivityService extends BaseService { self::OP_SUM); $this->internalUpdateRankActivity( self::KILLS_TYPE, - getReqVal('kills_time', 0), + getReqVal('kills', 0), self::OP_SUM); } @@ -68,7 +68,7 @@ class RankActivityService extends BaseService { private function internalUpdateRankActivity($type, $val, $opt) { - $meta = mt\RankActivity::get(type); + $meta = mt\RankActivity::get($type); if (!$meta || !mt\RankActivity::isActivityPeriod($meta)) { return; } @@ -83,7 +83,7 @@ class RankActivityService extends BaseService { array( 'value' => function () use($val, $opt) { if ($opt == self::OP_SUM) { - return "value + ${val})"; + return "value + ${val}"; } else if ($opt == self::OP_GREATEST) { return "GREATEST(0, ${val})"; } else {