From dc87d70fdfd62ce0f15b46a95ca7a0cb0dbd2f6d Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Mon, 28 Feb 2022 13:48:28 +0800
Subject: [PATCH] 1

---
 webapp/mt/Task.php                 |  6 +++---
 webapp/services/MissionService.php | 10 +++++++++-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/webapp/mt/Task.php b/webapp/mt/Task.php
index 4161389f..d43beb9c 100644
--- a/webapp/mt/Task.php
+++ b/webapp/mt/Task.php
@@ -80,8 +80,8 @@ class Task {
     {
         $metaList = array();
         if ($type == self::OFFER_REWARD_MISSION_CUSTOM_TYPE) {
-            foreach ($missionService->getOfferRewardMissions() as $missionId) {
-                $meta = self::get($missionId);
+            foreach ($missionService->getOfferRewardMissions() as $mission) {
+                $meta = self::get($mission['mission_id']);
                 if ($meta && $meta['type'] == self::OFFER_REWARD_MISSON_TYPE) {
                     array_push($metaList, $meta);
                 }
@@ -124,7 +124,7 @@ class Task {
         $metas = array();
         foreach (self::getMetaList() as $meta) {
             if ($meta['type'] == self::OFFER_REWARD_MISSON_TYPE) {
-                if (!array_find($excludeMetas, function($val, $meta) {
+                if (!array_find($excludeMetas, function($val) use($meta) {
                     return $val['mission_id'] == $meta['id'];
                 })) {
                     array_push($metas, $meta);
diff --git a/webapp/services/MissionService.php b/webapp/services/MissionService.php
index ea61082a..0db78ea6 100644
--- a/webapp/services/MissionService.php
+++ b/webapp/services/MissionService.php
@@ -402,7 +402,7 @@ class MissionService extends BaseService {
         break;
         case mt\Task::OFFER_REWARD_COND:
         {
-            $info = $this->getOfferRewardMissinoInfo($missionDto['mission_id']);
+            $info = $this->getOfferRewardMissionInfo($missionDto['mission_id']);
             if ($info) {
 
             }
@@ -563,6 +563,9 @@ class MissionService extends BaseService {
         $num = min(count($metas), mt\Parameter::getVal('wanted_refresh_mission_num', 0));
         if ($num > 0) {
             $selectKeys = array_rand($metas, $num);
+            if (!is_array($selectKeys)) {
+                $selectKeys = array($selectKeys);
+            }
             foreach ($selectKeys as $key) {
                 $meta = $metas[$key];
                 array_push($this->offerRewartdMission['missions'],
@@ -577,6 +580,11 @@ class MissionService extends BaseService {
         }
     }
 
+    public function getOfferRewardMissions()
+    {
+        return $this->offerRewartdMission['missions'];
+    }
+
     private function getOfferRewardMissionInfo($missionId)
     {