From 5d310a25650f4b6c753cd7b1e8610a992ed045cd Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Fri, 20 Mar 2020 15:05:35 +0800
Subject: [PATCH] 1

---
 webapp/controller/PassController.class.php  | 7 +++++++
 webapp/controller/QuestController.class.php | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/webapp/controller/PassController.class.php b/webapp/controller/PassController.class.php
index b3f24f0..52dfc09 100644
--- a/webapp/controller/PassController.class.php
+++ b/webapp/controller/PassController.class.php
@@ -313,6 +313,11 @@ class PassController{
             return;
         }
 
+        if ($row['pass_status'] == 1) {
+            phpcommon\sendError(ERR_USER_BASE + 2, '奖励已领取');
+            return;
+        }
+
         $reward = array();
         $level = 0;
         $seaPoint_meta_table = require('../res/seasomPoint@seasomPoint.php');
@@ -354,12 +359,14 @@ class PassController{
             die();
             return;
         }
+        $coin_num = $addreward->getCoinNum($account_id);
         $diamond_num = $addreward->getDiamondNum($account_id);
         echo json_encode(array(
             'errcode' => 0,
             'errmsg'=> '',
             'item_list' => $reward,
             'level' => $level,
+            'coin_nums' => $coin_num,
             'diamond_nums' => $diamond_num,
             'all_item_list' => $all_item_list
         ));
diff --git a/webapp/controller/QuestController.class.php b/webapp/controller/QuestController.class.php
index e335f6b..e7f140c 100644
--- a/webapp/controller/QuestController.class.php
+++ b/webapp/controller/QuestController.class.php
@@ -167,7 +167,7 @@ class QuestController{
             $item_id = $item_id_array[$key][0];
             $item_num = $num_array[$key][0] * $times;
             $addreward = new classes\AddReward();
-            $addreward->addReward($item_id, $item_num, $account_id);
+            $addreward->addReward($item_id, $item_num, $account_id, 0);
         } else {
             $q = $this->getQuest($quest_id);
             if (!$q) {
@@ -178,7 +178,7 @@ class QuestController{
             $reward_id = $array[0][0];
             $reward_num = $array[0][1] * $times;
             $addreward = new classes\AddReward();
-            $addreward->addReward($reward_id, $reward_num, $account_id);
+            $addreward->addReward($reward_id, $reward_num, $account_id, 0);
         }
         $addreward = new classes\AddReward();
         $coin_num = $addreward->getCoinNum($account_id);