diff --git a/doc/SeasonCard.py b/doc/SeasonCard.py
index b67e26b5..334f9f09 100644
--- a/doc/SeasonCard.py
+++ b/doc/SeasonCard.py
@@ -35,6 +35,20 @@ class SeasonCard(object):
                     ['property_chg', _common.PropertyChg(), '属性变更'],
                 ]
             },
+            {
+                'name': 'getAllReward',
+                'desc': '领取全部等级奖品',
+                'group': 'SeasonCard',
+                'url': 'webapp/index.php?c=SeasonCard&a=getAllReward',
+                'params': [
+                    _common.ReqHead(),
+                ],
+                'response': [
+                    _common.RspHead(),
+                    ['award', _common.Award(), '奖励信息'],
+                    ['property_chg', _common.PropertyChg(), '属性变更'],
+                ]
+            },
             {
                 'name': 'buyLevel',
                 'desc': '购买赛季手册等级',
diff --git a/webapp/services/MissionService.php b/webapp/services/MissionService.php
index 5ef6dee2..0a6f4ad6 100644
--- a/webapp/services/MissionService.php
+++ b/webapp/services/MissionService.php
@@ -13,6 +13,10 @@ use models\Mission;
 
 class MissionService extends BaseService {
 
+    private $userInfo = null;
+    private $seasonDb = null;
+    private $missionDb = null;
+
     public function getMissionDto($userInfo, $seasonDb, $missionDb, $missionMeta)
     {
         $missionDto = array(
@@ -35,7 +39,7 @@ class MissionService extends BaseService {
             }
         }
         $handled = true;
-        switch ($missionMeta['type']) {
+        switch ($missionMeta['condition']) {
         case mt\Task::DAILY_LOGIN_TIMES_COND:
         {
             //今日登陆
@@ -119,26 +123,26 @@ class MissionService extends BaseService {
         break;
         case mt\Task::USE_WEAPON_KILL_NUM_COND:
         {
-            //使用X枪械击杀Y个敌人
-            $handled = false;
+            //使用X枪械击杀Y个敌人 cond_param1=equip.type cond_param2=equip.sub_type
+            $missionDto['current'] = $this->getWeaponKills($missionMeta);
         }
         break;
         case mt\Task::USE_WEAPON_DAMGE_OUT_COND:
         {
-            //使用X种枪械对敌人累计造成Y点伤害
-            $handled = false;
+            //使用X种枪械对敌人累计造成Y点伤害 cond_param1=equip.type cond_param2=equip.sub_type
+            $missionDto['current'] = $this->getWeaponDamageOut($missionMeta);
         }
         break;
         case mt\Task::USE_WEAPON_SLOT_TIMES_COND:
         {
             //使用某个槽位的次数 cond_param1=槽位
-            $handled = false;
+            $missionDto['current'] = $this->getWeaponSlotUseTimes($missionMeta);
         }
-        break;
+       break;
         case mt\Task::GET_EQUIP_TIMES_COND:
         {
             //获得某种类型的装备 cond_param1=equip.type cond_param2=equip.sub_type
-            $handled = false;
+            $missionDto['current'] = $this->getEquipObtainCount($missionMeta);
         }
         break;
         case mt\Task::TOTAL_DIVING_TIMES_COND:
@@ -172,18 +176,20 @@ class MissionService extends BaseService {
         case mt\Task::BATTLE_IN_HERO_LV_COND:
         {
             //单局内英雄技能升级到X级
-            $handled = false;
+            $missionDto['current'] = $this->getBattleData($userInfo, $seasonDb, $missionDb, $missionMeta,
+                                                          'max_single_battle_hero_lv');
         }
         break;
         case mt\Task::BATTLE_IN_GUN_LV_COND:
         {
-            //单局内英雄专属枪械升到X级
-            $handled = false;
+            //单局内英雄专属枪械升到X级 cond_param1=英雄id
+            $missionDto['current'] = $this->getBattleData($userInfo, $seasonDb, $missionDb, $missionMeta,
+                                                          'max_single_battle_hero_weapon_lv' . $missionMeta['param1']);
         }
         break;
         case mt\Task::TOTAL_MEDICINE_TIMES_COND:
         {
-            //累计使用X药品Y次
+            //累计使用X药品Y次 cond_param1=槽位
             $missionDto['current'] = $this->getBattleData($userInfo, $seasonDb, $missionDb, $missionMeta,
                                                    'use_medicine_times');
         }
@@ -312,7 +318,7 @@ class MissionService extends BaseService {
             $missionDto['state'] = Mission::RECEIVEABLE_STATE;
         }
         if (!$handled) {
-            var_dump($missionDto);
+            error_log(json_encode($missionDto));
         }
         return $missionDto;
     }
@@ -335,4 +341,24 @@ class MissionService extends BaseService {
         return $val;
     }
 
+    private function getWeaponDamageOut($missionMeta)
+    {
+
+    }
+
+    private function getWeaponKills($missionMeta)
+    {
+
+    }
+
+    private function getWeaponSlotUseTimes($missionMeta)
+    {
+
+    }
+
+    private function getEquipObtainCount($missionMeta)
+    {
+
+    }
+
 }