diff --git a/webapp/controller/RechargeController.class.php b/webapp/controller/RechargeController.class.php index 14ad312..af593cc 100644 --- a/webapp/controller/RechargeController.class.php +++ b/webapp/controller/RechargeController.class.php @@ -705,13 +705,21 @@ class RechargeController $itemidlist = explode('|', $dropconf['item_id']); $itemnumlist = explode('|', $dropconf['num']); $addreward = new classes\AddReward(); + $all_item_list = array(); foreach ($itemidlist as $index => $itemid) { array_push($item_list, array( 'item_id' => $itemid, 'item_num' => $itemnumlist[$key], 'time' => 0, )); - $addreward->addReward($itemid, $itemnumlist[$key], $account_id, 0, 0); + $items = $addreward->addReward($itemid, $itemnumlist[$key], $account_id, 0, 0); + foreach ($items as $i) { + array_push($all_item_list, array( + 'item_id' => $i['item_id'], + 'item_num' => $i['item_num'], + 'time' => $i['time'], + )); + } } $found = true; @@ -725,6 +733,7 @@ class RechargeController 'diamond_nums' => $diamond_num, 'item_list' => $item_list, 'vip_info' => json_encode($vipinfo), + 'all_item_list' => $all_item_list, )); } } @@ -818,13 +827,21 @@ class RechargeController $itemidlist = explode('|', $activity_conf['item_id']); $itemnumlist = explode('|', $activity_conf['item_num']); $addreward = new classes\AddReward(); + $all_item_list = array(); foreach ($itemidlist as $index => $itemid) { array_push($item_list, array( 'item_id' => $itemid, 'item_num' => $itemnumlist[$key], 'time' => 0, )); - $addreward->addReward($itemid, $itemnumlist[$key], $account_id, 0, 0); + $items = $addreward->addReward($itemid, $itemnumlist[$key], $account_id, 0, 0); + foreach ($items as $i) { + array_push($all_item_list, array( + 'item_id' => $i['item_id'], + 'item_num' => $i['item_num'], + 'time' => $i['time'], + )); + } } $found = true; @@ -838,6 +855,7 @@ class RechargeController 'diamond_nums' => $diamond_num, 'item_list' => $item_list, 'recharge_activity' => json_encode($activity), + 'all_item_list' => $all_item_list, )); } }