From 23730ec53220a3e3e77e5ea1a9ac767f3e4cfc1b Mon Sep 17 00:00:00 2001 From: songliang Date: Thu, 29 Jun 2023 19:45:59 +0800 Subject: [PATCH 1/4] ... --- webapp/controller/ShopController.class.php | 41 ++++++++++++++++++++-- 1 file changed, 38 insertions(+), 3 deletions(-) diff --git a/webapp/controller/ShopController.class.php b/webapp/controller/ShopController.class.php index 88579841..018d136e 100644 --- a/webapp/controller/ShopController.class.php +++ b/webapp/controller/ShopController.class.php @@ -146,6 +146,11 @@ class ShopController extends BaseAuthedController $count = $this->countFreeBuyTimes($goods); $goods['free_num'] = $goods['free_num'] - $count; } + + $address = $this->_getAddress(); + if ($address) { + $goods['pending'] = $this->checkPendingBuyGoodsNormal($address, $goods['goods_id'], $goods['shop_id'], $goods['id']); + } } $this->_rspData( @@ -874,7 +879,6 @@ class ShopController extends BaseAuthedController $buyRecordHash = ShopBuyRecord::allToHash(); $boughtTimes = 1; - $row['limit_type'] = 1; switch ($row['limit_type']) { case ShopController::DAILY_BUY_LIMIT: { $buyRecord = getXVal($buyRecordHash, $id); @@ -1287,7 +1291,7 @@ class ShopController extends BaseAuthedController public function getChestItems() { $goods_id = getReqVal('goods_id', 0); - + $meta = mt\Item::get($goods_id); if ($meta['type'] != mt\Item::CHEST_BOX_TYPE) { $this->_rspErr(2, 'goods_id is invalid'); @@ -1316,7 +1320,8 @@ class ShopController extends BaseAuthedController ); } - public function getMyBlindBoxs() { + public function getMyBlindBoxs() + { $itemDb = Bag::getAllByType(mt\Item::CHEST_BOX_TYPE); $items = array(); @@ -1473,6 +1478,36 @@ class ShopController extends BaseAuthedController return $row[0]['cnt']; } + private function checkPendingBuyGoodsNormal($address, $goodsId, $shop_id, $id) + { + $self = myself(); + if (!$self) return; + + $conn = $self->_getMysql(''); + + $rows = SqlHelper::select( + $conn, + 't_bc_order', + array('ext_data'), + array( + 'address' => $address, + 'item_id' => $goodsId, + 'status' => 0, + ) + ); + foreach ($rows as $row) { + $extData = json_decode($row['ext_data'], true); + if ($extData['mode'] == SHOP_BUY_MODE_NORMAL) { + if ($extData['shop_id'] == $shop_id) { + if ($extData['id'] == $id) { + return 1; + } + } + } + } + return 0; + } + private function outsideBuy($shopId, $itemId, $itemNum, $costItemId) { $propertyChgService = new services\PropertyChgService(); From ad8adc28386dbda0ba977275ece06ed56941ae6c Mon Sep 17 00:00:00 2001 From: songliang Date: Thu, 29 Jun 2023 20:19:31 +0800 Subject: [PATCH 2/4] ... --- doc/Shop.py | 15 +++++----- webapp/controller/ShopController.class.php | 32 +++++++++++++++++----- 2 files changed, 33 insertions(+), 14 deletions(-) diff --git a/doc/Shop.py b/doc/Shop.py index 3666af5a..d7eecb08 100644 --- a/doc/Shop.py +++ b/doc/Shop.py @@ -2,6 +2,7 @@ import _common + class Shop(object): def __init__(self): @@ -95,7 +96,7 @@ class Shop(object): ['property_chg', _common.PropertyChg(), '属性变更'], ['goods_chg', _common.NewGoods(), '购买后更新商品的最新信息(可能为null客户端需要做容错处理)'], ] - }, + }, { 'name': 'buyGoodsNormal', 'desc': '购买商品(正式)', @@ -114,7 +115,7 @@ class Shop(object): ['property_chg', _common.PropertyChg(), '属性变更'], ['goods_chg', _common.NewGoods(), '购买后更新商品的最新信息(可能为null客户端需要做容错处理)'], ] - }, + }, { 'name': 'buyGoodsDirect', 'desc': '直接购买(充值,gold)', @@ -130,7 +131,7 @@ class Shop(object): 'response': [ _common.RspHead(), ] - }, + }, { 'name': 'startGoodsDirect', 'desc': '发起一个 直接购买(充值,gold)', @@ -146,7 +147,7 @@ class Shop(object): _common.RspHead(), ['order_id', '', '订单id'], ] - }, + }, { 'name': 'statusGoodsDirect', 'desc': '查询 直接购买(充值,gold) 状态', @@ -160,7 +161,7 @@ class Shop(object): _common.RspHead(), ['status', 0, '订单状态 0:未支付 1:已支付 2:支付失败'], ] - }, + }, { 'name': 'getPayMethods', 'desc': '获取支付方式', @@ -240,7 +241,7 @@ class Shop(object): 'url': 'webapp/index.php?c=Shop&a=getChestItems', 'params': [ _common.ReqHead(), - ['goods_id', 0, '宝箱物品id item_id'], + ['id', 0, '商品唯一id，参见shopGoods表'], ], 'response': [ _common.RspHead(), @@ -274,5 +275,5 @@ class Shop(object): ['!items', [0], '盲盒列表'], ] }, - + ] diff --git a/webapp/controller/ShopController.class.php b/webapp/controller/ShopController.class.php index 018d136e..9daa8c2a 100644 --- a/webapp/controller/ShopController.class.php +++ b/webapp/controller/ShopController.class.php @@ -143,7 +143,7 @@ class ShopController extends BaseAuthedController $goods['goods_num'] = 1; } if (!empty($goods['free_type'])) { - $count = $this->countFreeBuyTimes($goods); + $count = $this->countFreeBuyTimes($goods['free_type'], $goods['id'], $goods['goods_id']); $goods['free_num'] = $goods['free_num'] - $count; } @@ -857,7 +857,7 @@ class ShopController extends BaseAuthedController $token_pos = array_search($token_type, $check_token_type, true); $isFreeBuy = false; if (!empty($row['free_type'])) { - $count = $this->countFreeBuyTimes($row); + $count = $this->countFreeBuyTimes($row['free_type'], $row['id'], $row['goods_id']); if ($count < $row['free_num']) { $isFreeBuy = true; } @@ -1172,7 +1172,7 @@ class ShopController extends BaseAuthedController $cost = $shop['price'] * $num; $isFreeBuy = false; if (!empty($shop['free_type'])) { - $count = $this->countFreeBuyTimes($shop); + $count = $this->countFreeBuyTimes($shop['free_type'], $shop['id'], $shop['goods_id']); if ($count < $shop['free_num']) { $isFreeBuy = true; } @@ -1290,8 +1290,17 @@ class ShopController extends BaseAuthedController public function getChestItems() { - $goods_id = getReqVal('goods_id', 0); + $address = $this->_getAddress(); + // if (!$address) { + // $this->_rspErr(2, 'address is invalid'); + // return; + // } + $id = getReqVal('id', 0); + $goods = mt\ShopGoods::get($id); + $goods_id = $goods['goods_id']; + $shop_id = $goods['shop_id']; + $meta = mt\Item::get($goods_id); if ($meta['type'] != mt\Item::CHEST_BOX_TYPE) { $this->_rspErr(2, 'goods_id is invalid'); @@ -1302,20 +1311,29 @@ class ShopController extends BaseAuthedController $record = array(); foreach ($itemStore as $key => $value) { foreach ($value as $k => $v) { + if (empty($record[$v['item_id']])) { + $record[$v['item_id']] = 0; + } $record[$v['item_id']] += 1; } } + $free_num = $goods['free_num'] - $this->countFreeBuyTimes($address, $id, $goods_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, ) )); $this->_rspData( array( 'items' => array_keys($record), + 'free_num' => $free_num, + 'pending' => $pending, ) ); } @@ -1811,16 +1829,16 @@ class ShopController extends BaseAuthedController return phpcommon\bnToStr($ret_price); } - private function countFreeBuyTimes($goods) + private function countFreeBuyTimes($free_type, $id, $goods_id) { $conn = myself()->_getMysql(''); $account = myself()->_getAccountId(); - switch ($goods['free_type']) { + switch ($free_type) { case 1: { $dayTime = myself()->_getNowDaySeconds(); $sql = 'SELECT COUNT(*) as cnt FROM t_shop_free_record WHERE account_id = ? AND `id` = ? AND goods_id = ? AND createtime >= ?'; - $row = $conn->execQueryOne($sql, array($account, $goods['id'], $goods['goods_id'], $dayTime)); + $row = $conn->execQueryOne($sql, array($account, $id, $goods_id, $dayTime)); return $row['cnt']; } break; From 2ebf134999f1b07b04903cabf66d105d0990b98a Mon Sep 17 00:00:00 2001 From: songliang Date: Thu, 29 Jun 2023 20:26:01 +0800 Subject: [PATCH 3/4] ... --- webapp/controller/ShopController.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/controller/ShopController.class.php b/webapp/controller/ShopController.class.php index 9daa8c2a..ed26699f 100644 --- a/webapp/controller/ShopController.class.php +++ b/webapp/controller/ShopController.class.php @@ -1300,7 +1300,7 @@ class ShopController extends BaseAuthedController $goods = mt\ShopGoods::get($id); $goods_id = $goods['goods_id']; $shop_id = $goods['shop_id']; - + $meta = mt\Item::get($goods_id); if ($meta['type'] != mt\Item::CHEST_BOX_TYPE) { $this->_rspErr(2, 'goods_id is invalid'); From a1a0ac9653b119907344ab08593e965043b5af55 Mon Sep 17 00:00:00 2001 From: songliang Date: Fri, 30 Jun 2023 10:09:31 +0800 Subject: [PATCH 4/4] ... --- webapp/controller/ShopController.class.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/webapp/controller/ShopController.class.php b/webapp/controller/ShopController.class.php index ed26699f..9e91ad32 100644 --- a/webapp/controller/ShopController.class.php +++ b/webapp/controller/ShopController.class.php @@ -413,7 +413,8 @@ class ShopController extends BaseAuthedController $itemMeta = mt\Item::get($row['goods_id']); $propertyChgService = new services\PropertyChgService(); for ($i = 0; $i < $goods_num; $i++) { - $this->internalAddItem($propertyChgService, $itemMeta, $goods_count, 0); + // 既然这种货币是在链上的，那么这里不应该增加任何物品， + // $this->internalAddItem($propertyChgService, $itemMeta, $goods_count, 0); } $awardService = new services\AwardService(); // $awardService->addItem($row['goods_id'], $goods_num);