diff --git a/doc/Shop.py b/doc/Shop.py index 1e7140a0..974e0e63 100644 --- a/doc/Shop.py +++ b/doc/Shop.py @@ -109,9 +109,7 @@ class Shop(object): ], 'response': [ _common.RspHead(), - ['ret', _common.Union([ - [_common.ShopTrans(), '链上交易结果'], - ]), '购买结果'], + ['block_chain', [_common.ShopTrans()], '链上交易结果'], ['award', _common.Award(), '奖励信息'], ['property_chg', _common.PropertyChg(), '属性变更'], ['goods_chg', _common.NewGoods(), '购买后更新商品的最新信息(可能为null客户端需要做容错处理)'], diff --git a/webapp/controller/ShopController.class.php b/webapp/controller/ShopController.class.php index bce9378d..5cbf5db4 100644 --- a/webapp/controller/ShopController.class.php +++ b/webapp/controller/ShopController.class.php @@ -1034,6 +1034,7 @@ class ShopController extends BaseAuthedController public function buyGoodsDS() { + $account = $this->_getAccountId(); $address = $this->_getAddress(); if (empty($address)) { $this->_rspErr(2, 'address is empty'); @@ -1063,7 +1064,7 @@ class ShopController extends BaseAuthedController return; } - if ($row['address'] != $address) { + if ($row['address'] != $account) { $this->_rspErr(2, 'address is invalid'); return; }