From b2b6d231008c8614020a70acd329d03d56640af2 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Wed, 8 Dec 2021 19:48:35 +0800 Subject: [PATCH] 1 --- webapp/controller/SeasonController.class.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/webapp/controller/SeasonController.class.php b/webapp/controller/SeasonController.class.php index 49323a4..ef5db98 100644 --- a/webapp/controller/SeasonController.class.php +++ b/webapp/controller/SeasonController.class.php @@ -6,6 +6,7 @@ require_once('mt/Season.php'); require_once('models/Season.php'); +require_once('services/AwardService.php'); require_once('services/PropertyChgService.php'); require_once('services/SeasonService.php'); @@ -16,6 +17,7 @@ use models\Season; class SeasonController extends BaseAuthedController { private $propertyChgService = null; + private $awardService = null; private $userInfo = null; private $seasonService = null; private $currSeasonMeta = null; @@ -30,6 +32,7 @@ class SeasonController extends BaseAuthedController { die(); } $this->propertyChgService = new services\PropertyChgService(); + $this->awardService = new services\AwardService(); $this->userInfo = $this->_safeGetOrmUserInfo(); $this->seasonService = new services\SeasonService(); if (!$this->seasonService->checkSeason($this->userInfo)) { @@ -51,16 +54,13 @@ class SeasonController extends BaseAuthedController { { $rankMeta = mt\Rank::get($this->userInfo['rank']); $this->_rspData(array( - array( - 'info' => array( - 'season_id' => $this->currSeasonMeta['id'], - 'rank' => $this->userInfo['rank'], - 'max_score' => $rankMeta ? $rankMeta['max_score'] : 0, - 'noshow_score_bar' => $rankMeta ? $rankMeta['noshow_score_bar'] : 1, - 'mission' => $this->getMissionInfo() - ) - ), - 'property_chg' => $this->propertyChgService->toDto() + 'info' => array( + 'season_id' => $this->currSeasonMeta['id'], + 'rank' => $this->userInfo['rank'], + 'max_score' => $rankMeta ? $rankMeta['max_score'] : 0, + 'noshow_score_bar' => $rankMeta ? $rankMeta['noshow_score_bar'] : 1, + 'mission' => $this->getMissionInfo() + ) )); }