diff --git a/webapp/controller/PayActivityController.class.php b/webapp/controller/PayActivityController.class.php
index e2950825..aaba0d48 100644
--- a/webapp/controller/PayActivityController.class.php
+++ b/webapp/controller/PayActivityController.class.php
@@ -487,7 +487,7 @@ class PayActivityController{
         } else if ($type == 2) {
             $item_list = $this->getSumReward($account_id, $user_db['sum_list'], $id, $draw_type);
         } else if ($type == 3) {
-            $item_list = $this->getQuestReward($account_id, $user_db, $type, $id, $idx);
+            $item_list = $this->getQuestReward($account_id, $user_db, $type, $id, $idx, $draw_type);
         } else if ($type == 4) {
             $item_list = $this->getShopReward($account_id, $user_db, $type, $id, $idx);
         } else if ($type == 5) {
@@ -595,7 +595,6 @@ class PayActivityController{
 
     protected function getSumReward($account_id, $info_list, $id, $draw_type)
     {
-        error_log($id);
         $act = metatable\getActPlusById($id);
         $item_conf = metatable\getItemById($act['reward']);
         $item_list = array();
@@ -629,16 +628,26 @@ class PayActivityController{
         return $item_list;
     }
 
-    protected function getQuestReward($account_id, $user_db, $type, $id, $idx)
+    protected function getQuestReward($account_id, $user_db, $type, $id, $idx, $condition)
     {
         $item_list = array();
         foreach ($user_db['quest_list'] as &$us) {
-            if ($us['id'] != $id) {
+            if (!isset($us['id']) || $us['id'] != $id) {
                 continue;
             }
             $num = 0;
             foreach ($us['quest_list'] as &$q) {
-                if ($q['id'] != $idx || $q['status'] != 1) {
+                if ($q['id'] != $idx) {
+                    $num++;
+                    continue;
+                }
+
+                if ($q['condition'] != $condition) {
+                    $num++;
+                    continue;
+                }
+
+                if ($q['status'] != 1) {
                     $num++;
                     continue;
                 }
diff --git a/webapp/controller/RoleController.class.php b/webapp/controller/RoleController.class.php
index b5a814e5..fb4d1cfe 100644
--- a/webapp/controller/RoleController.class.php
+++ b/webapp/controller/RoleController.class.php
@@ -438,8 +438,8 @@ class RoleController{
             die();
         }
         $ret1 = $conn->execScript('INSERT INTO bag(accountid, id, color_id, status, num, active_time, create_time, modify_time) ' .
-                                  ' VALUES(:account_id, :id, 0, :status, 300, :active_time, :create_time, :modify_time) ' .
-                                  ' ON DUPLICATE KEY UPDATE accountid=:account_id, id=:id, color_id=0, status=:status, num=200, active_time=:active_time, modify_time=:modify_time;',
+                                  ' VALUES(:account_id, :id, 0, :status, 400, :active_time, :create_time, :modify_time) ' .
+                                  ' ON DUPLICATE KEY UPDATE accountid=:account_id, id=:id, color_id=0, status=:status, num=400, active_time=:active_time, modify_time=:modify_time;',
                                   array(
                                       ':account_id' => $account_id,
                                       ':id' => 10010,
diff --git a/webapp/controller/ShopController.class.php b/webapp/controller/ShopController.class.php
index d5d9ae48..262543cb 100644
--- a/webapp/controller/ShopController.class.php
+++ b/webapp/controller/ShopController.class.php
@@ -488,7 +488,7 @@ class ShopController{
             return;
         }
         foreach ($user_db['shop_list'] as &$us) {
-            if ($us['id'] != $id) {
+            if (!isset($us['id']) || $us['id'] != $id) {
                 continue;
             }
             if ($us['reward']['refreshnum'] != '') {