diff --git a/webapp/controller/ShopController.class.php b/webapp/controller/ShopController.class.php index 2e6742d3..e71c9d47 100644 --- a/webapp/controller/ShopController.class.php +++ b/webapp/controller/ShopController.class.php @@ -694,7 +694,7 @@ class ShopController extends BaseAuthedController } } - public function buyGoodsDSDiamond() + public function buyGoodsDS() { $idx = getReqVal('idx', 0); $grid = getReqVal('grid', 0); @@ -790,7 +790,7 @@ class ShopController extends BaseAuthedController ); } - public function buyGoodsDS() + private function buyGoodsDSOld() { $account = $this->_getAccountId(); $address = $this->_getAddress(); @@ -894,7 +894,7 @@ class ShopController extends BaseAuthedController ); } - public function openBlindBox() + private function openBlindBox() { $account = $this->_getAccountId(); @@ -952,11 +952,11 @@ class ShopController extends BaseAuthedController public function getChestItems() { - $address = $this->_getAddress(); - if (!$address) { - $this->_rspErr(2, 'address is invalid'); - return; - } + // $address = $this->_getAddress(); + // if (!$address) { + // $this->_rspErr(2, 'address is invalid'); + // return; + // } $id = getReqVal('id', 0); $goods = mt\ShopGoods::get($id); @@ -999,13 +999,13 @@ class ShopController extends BaseAuthedController } $free_num = $goods['free_num']; - $pending = $this->checkPendingBuyGoodsNormal($address, $goods_id, $shop_id, $id); + // $pending = $this->checkPendingBuyGoodsNormal($address, $goods_id, $shop_id, $id); error_log("getChestItems start " . json_encode( array( 'goods_id' => $goods_id, 'items' => array_keys($record), 'free_num' => $free_num, - 'pending' => $pending, + 'pending' => 0, ) )); @@ -1013,12 +1013,12 @@ class ShopController extends BaseAuthedController array( 'items' => array_keys($record), 'free_num' => $free_num, - 'pending' => $pending, + 'pending' => 0, ) ); } - public function getMyBlindBoxs() + private function getMyBlindBoxs() { $itemDb = Bag::getAllByType(mt\Item::CHEST_BOX_TYPE);