diff --git a/doc/Other.py b/doc/Other.py index 01ba5e82..9eb42fd1 100644 --- a/doc/Other.py +++ b/doc/Other.py @@ -11,7 +11,7 @@ class Other(object): 'url': 'webapp/index.php?c=Other&a=tag', 'params': [ _common.ReqHead(), - ['types', '', '红点类型(!!!注意由于红点的计算量较大,最好并发分批取红点状态)","分割 1:英雄 2:芯片 3:背包 4:签到 5:算力 6:皮肤 7:新人任务 8:日周常任务'], + ['types', '', '红点类型(!!!注意由于红点的计算量较大,最好并发分批取红点状态)","分割 1:英雄 2:芯片 3:背包 4:签到 5:算力 6:皮肤 7:新人任务 8:日周常任务 9:拉新任务'], ], 'response': [ _common.RspHead(), diff --git a/webapp/controller/OtherController.class.php b/webapp/controller/OtherController.class.php index 28bc17d3..0c8ea1f9 100644 --- a/webapp/controller/OtherController.class.php +++ b/webapp/controller/OtherController.class.php @@ -53,6 +53,7 @@ class OtherController extends BaseAuthedController { const HERO_SKIN = 6; const ROOKIE_TASK = 7; const DAILY_TASK = 8; + const INVITE_NEW_TASK = 9; public function tag() { @@ -162,7 +163,7 @@ class OtherController extends BaseAuthedController { $missionService = new services\MissionService(); $userInfo = $this->_safeGetOrmUserInfo(); $missionService->init($userInfo, null); - if ($missionService->_isHaveRedTag()){ + if ($missionService->_isHaveRedTag(0)){ $state = 1; } array_push($list,array( @@ -170,6 +171,17 @@ class OtherController extends BaseAuthedController { 'state' => $state, )); } + break; + case self::INVITE_NEW_TASK :{ + $missionService = new services\MissionService(); + if ($missionService->_isHaveRedTag(1)){ + $state = 1; + } + array_push($list,array( + 'type' => self::INVITE_NEW_TASK, + 'state' => $state, + )); + } } } diff --git a/webapp/services/MissionService.php b/webapp/services/MissionService.php index aee31ce3..0889a686 100644 --- a/webapp/services/MissionService.php +++ b/webapp/services/MissionService.php @@ -1494,8 +1494,13 @@ class MissionService extends BaseService { return false; } - public function _isHaveRedTag(){ - foreach ($this->dailyMission['missions'] as $mission) { + public function _isHaveRedTag($type){ + if ($type == 0){ + $missionMetaList = $this->dailyMission['missions']; + }else{ + $missionMetaList = mt\Task::getCustomTypeMetaList(\mt\Task::NEW_USER_MISSON_TYPE, $this); + } + foreach ($missionMetaList as $mission) { $missionMeta = mt\Task::get($mission['mission_id']); $missionDb = Mission::find($mission['mission_id']); $missionDto = $this->getMissionDto($this->userInfo,'',$missionDb,$missionMeta);