From 4b5eb1d2396b6fff14428fc7bb7b58218b852efb Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Wed, 8 Dec 2021 10:57:02 +0800 Subject: [PATCH] 1 --- webapp/controller/MissionController.class.php | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/webapp/controller/MissionController.class.php b/webapp/controller/MissionController.class.php index 21a0b87..cc65f07 100644 --- a/webapp/controller/MissionController.class.php +++ b/webapp/controller/MissionController.class.php @@ -22,6 +22,7 @@ use models\Season; class MissionController extends BaseAuthedController { + private $missionService = null; private $propertyChgService = null; private $userInfo = null; private $seasonService = null; @@ -53,6 +54,7 @@ class MissionController extends BaseAuthedController { $this->_rspErr(10, '服务器内部错误'); die(); } + $this->missionService = new services\MissionService(); } public function missionList() @@ -63,7 +65,8 @@ class MissionController extends BaseAuthedController { $missionDtoList = array(); foreach ($missionMetaList as $missionMeta) { $missionDb = getXVal($missionHash, $missionMeta['id'], null); - $missionDto = $this->getMissionDto($this->userInfo, $this->seasonDb, $missionDb, $missionMeta); + $missionDto = $this->missionService->getMissionDto( + $this->userInfo, $this->seasonDb, $missionDb, $missionMeta); array_push($missionDtoList, $missionDto); } $this->_rspData(array( @@ -80,7 +83,8 @@ class MissionController extends BaseAuthedController { return; } $missionDb = Mission::find($missionId); - $missionDto = $this->getMissionDto($this->userInfo, $this->seasonDb, $missionDb, $missionMeta); + $missionDto = $this->missionService->getMissionDto( + $this->userInfo, $this->seasonDb, $missionDb, $missionMeta); if (!$missionDto) { $this->_rspErr(10, '服务器内部错误'); return; @@ -105,7 +109,7 @@ class MissionController extends BaseAuthedController { $this->_scatterDrop($dropMeta, $this->awardService, $this->propertyChgService); Mission::add($missionId); $missionDb = Mission::find($missionId); - $missionDto = $this->getMissionDto($missionDb, $missionMeta); + $missionDto = $this->missionService->getMissionDto($missionDb, $missionMeta); $this->_rspData(array( 'award' => $this->awardService->toDto(), 'property_chg' => $this->propertyChgService->toDto(), @@ -121,7 +125,8 @@ class MissionController extends BaseAuthedController { $missionDtoList = array(); foreach ($missionMetaList as $missionMeta) { $missionDb = getXVal($missionHash, $missionMeta['id'], null); - $missionDto = $this->getMissionDto($this->userInfo, $this->seasonDb, $missionDb, $missionMeta); + $missionDto = $this->missionService->getMissionDto( + $this->userInfo, $this->seasonDb, $missionDb, $missionMeta); if ($missionDto['state'] == Mission::RECEIVEABLE_STATE) { array_push($missionDtoList, $missionDto); }