Commit 85c2b332 by 冷斌

fix bug

parent 438e1421
...@@ -1494,11 +1494,11 @@ class Api_Live extends PhalApi_Api { ...@@ -1494,11 +1494,11 @@ class Api_Live extends PhalApi_Api {
$key='getGiftList'; $key='getGiftList';
$giftlist=getcaches($key); $giftlist=getcaches($key);
if(!$giftlist){ // if(!$giftlist){
$domain = new Domain_Live(); $domain = new Domain_Live();
$giftlist=$domain->getGiftList(); $giftlist=$domain->getGiftList();
setcaches($key,$giftlist); setcaches($key,$giftlist);
} // }
$data = []; $data = [];
foreach ($giftlist as $key => $item) { foreach ($giftlist as $key => $item) {
if ($item['type'] == $this->type) { if ($item['type'] == $this->type) {
......
...@@ -459,6 +459,7 @@ class Model_Live extends PhalApi_Model_NotORM { ...@@ -459,6 +459,7 @@ class Model_Live extends PhalApi_Model_NotORM {
$rs=DI()->notorm->gift $rs=DI()->notorm->gift
->select("id,type,mark,giftname,needcoin,gifticon") ->select("id,type,mark,giftname,needcoin,gifticon")
->where('mark != 3')
->order("orderno asc,addtime desc") ->order("orderno asc,addtime desc")
->fetchAll(); ->fetchAll();
foreach($rs as $k=>$v){ foreach($rs as $k=>$v){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment