diff --git a/webapp/controller/PassController.class.php b/webapp/controller/PassController.class.php index b2cbefa5..3660f5db 100644 --- a/webapp/controller/PassController.class.php +++ b/webapp/controller/PassController.class.php @@ -66,7 +66,7 @@ class PassController extends BaseAuthedController { $passDb = Pass::find($this->currSeasonMeta['id']); $rewards = emptyReplace(json_decode($passDb['data'], true), array()); - $data = $this->_rewardHash($rewards,$type); + $data = $this->_rewardHash($rewards); $items = array(); switch ($type){ case 0 : { @@ -111,14 +111,16 @@ class PassController extends BaseAuthedController { switch ($type){ case 0 : { $data['basic'][$level]['state'] = 1; - $data['basic'] = array_values($data['basic']); + } break; case 1 : { $data['platinum'][$level]['state'] = 1; - $data['platinum'] = array_values($data['platinum']); + } } + $data['basic'] = array_values($data['basic']); + $data['platinum'] = array_values($data['platinum']); Pass::upsert($this->currSeasonMeta['id'],json_encode($data)); $this->_rspData(array( 'award' => $this->awardService->toDto(), @@ -172,25 +174,19 @@ class PassController extends BaseAuthedController { } - private function _rewardHash($reward,$type){ + private function _rewardHash($reward){ if (!$reward){ return array(); } $data = array(); - switch ($type){ - case 0 : { - foreach ($reward['basic'] as $value){ - $data['basic'][$value['level']] = $value; - } - } - break; - case 1:{ - foreach ($reward['platinum'] as $value){ - $data['platinum'][$value['level']] = $value; - } - } - break; + foreach ($reward['basic'] as $value){ + $data['basic'][$value['level']] = $value; } + + foreach ($reward['platinum'] as $value){ + $data['platinum'][$value['level']] = $value; + } + return $data; }