From 5cfcb7b361f828afe526c59b2ac668de38954d26 Mon Sep 17 00:00:00 2001 From: songliang Date: Fri, 7 Jul 2023 17:58:21 +0800 Subject: [PATCH 1/7] ... --- webapp/controller/MarketController.class.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/webapp/controller/MarketController.class.php b/webapp/controller/MarketController.class.php index 59e15331..2c09ad72 100644 --- a/webapp/controller/MarketController.class.php +++ b/webapp/controller/MarketController.class.php @@ -816,12 +816,14 @@ class MarketController extends BaseAuthedController }; $search_filter_fn = function ($f) { $str = ''; + error_log('search_filter ' . json_encode($f)); $arr_options = array(); foreach ($f as $v) { if (!empty($v)) { array_push($arr_options, 'c_name=\'' . $v . '\' OR token_id=\'' . $v . '\' '); } } + error_log('$$search_filter ' . json_encode($arr_options)); if (count($arr_options) > 0) { $str = implode('OR ', $arr_options); $str = 'AND (' . $str . ') '; From 11257b9abfb8881c3bc97b5bd025822834de87c6 Mon Sep 17 00:00:00 2001 From: songliang Date: Fri, 7 Jul 2023 18:01:56 +0800 Subject: [PATCH 2/7] ... --- webapp/controller/MarketController.class.php | 1 + 1 file changed, 1 insertion(+) diff --git a/webapp/controller/MarketController.class.php b/webapp/controller/MarketController.class.php index 2c09ad72..c1761773 100644 --- a/webapp/controller/MarketController.class.php +++ b/webapp/controller/MarketController.class.php @@ -954,6 +954,7 @@ class MarketController extends BaseAuthedController } $search_filters = getReqVal('search_filters', ''); + error_log('search_filters:' . $search_filters); if ($search_filters != '') { $search_filter_array = explode('|', $search_filters); } else { From 5e36134bcb5839e465fe9e7cbe15916232cfcd7f Mon Sep 17 00:00:00 2001 From: songliang Date: Fri, 7 Jul 2023 18:05:21 +0800 Subject: [PATCH 3/7] ... --- webapp/controller/MarketController.class.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/webapp/controller/MarketController.class.php b/webapp/controller/MarketController.class.php index c1761773..0a733544 100644 --- a/webapp/controller/MarketController.class.php +++ b/webapp/controller/MarketController.class.php @@ -763,7 +763,13 @@ class MarketController extends BaseAuthedController $job_filters = getReqVal('job_filters', ''); $job_filter_array = explode('|', $job_filters); $search_filters = getReqVal('search_filters', ''); - $search_filter_array = explode('|', $search_filters); + error_log('search_filters:' . $search_filters); + if ($search_filters != '') { + $search_filter_array = explode('|', $search_filters); + } else { + $search_filter_array = array(); + } + $lv_filter = getReqVal('lv_filter', 0); $quality_filter = getReqVal('quality_filter', 0); $durability_filter = getReqVal('durability_filter', 0); From c783b46bf34ec2880b863679d59ec2e927f6f401 Mon Sep 17 00:00:00 2001 From: songliang Date: Fri, 7 Jul 2023 20:39:56 +0800 Subject: [PATCH 4/7] ... --- webapp/controller/ShopController.class.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/webapp/controller/ShopController.class.php b/webapp/controller/ShopController.class.php index fdea0e17..6bb9778b 100644 --- a/webapp/controller/ShopController.class.php +++ b/webapp/controller/ShopController.class.php @@ -706,6 +706,8 @@ class ShopController extends BaseAuthedController $price = $this->normalizeWeb3Price($num); $item_id = V_ITEM_DIAMOND; $item_count = $num; + + error_log("buy diamond start " . $num); $response = services\BlockChainService::gameItemMallBuy( Transaction::BUY_GOODS_ACTION_TYPE, From 093a16442ab8509b90d7db1743f71e8c5d0b1b48 Mon Sep 17 00:00:00 2001 From: songliang Date: Fri, 7 Jul 2023 20:52:33 +0800 Subject: [PATCH 5/7] ... --- webapp/controller/MarketController.class.php | 5 +++-- webapp/services/BlockChainService.php | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/webapp/controller/MarketController.class.php b/webapp/controller/MarketController.class.php index 0a733544..47890863 100644 --- a/webapp/controller/MarketController.class.php +++ b/webapp/controller/MarketController.class.php @@ -1174,9 +1174,10 @@ class MarketController extends BaseAuthedController $this->_rspErr(1, 'goods not found, idx:' . $idx); return; } - - $response = services\BlockChainService::gameItemMallBuy( + + $response = services\BlockChainService::gameItemMarketBuy( Transaction::BUY_GOODS_FROM_MARKET_ACTION_TYPE, + $goods['owner_address'], $goods['s_price'], $goods['item_id'], $goods['amount'] diff --git a/webapp/services/BlockChainService.php b/webapp/services/BlockChainService.php index 8d712dc7..9dafdbd7 100644 --- a/webapp/services/BlockChainService.php +++ b/webapp/services/BlockChainService.php @@ -97,7 +97,7 @@ class BlockChainService { c */ - public static function gameItemMarketBuy($actionType, $price, $itemId, $itemNum) + public static function gameItemMarketBuy($actionType, $owner_address, $price, $itemId, $itemNum) { if (!($actionType > Transaction::BUY_BEGIN_ACTION_TYPE && $actionType < Transaction::BUY_END_ACTION_TYPE)) { @@ -118,6 +118,7 @@ class BlockChainService { 'a' => 'buy', 'account' => $account, 'price' => $price, + 'owner_address' => $owner_address, ); { $url = self::getWeb3ServiceUrl(); From e62136055eb5f3842f54d38ce8eca4c4f529f5df Mon Sep 17 00:00:00 2001 From: songliang Date: Fri, 7 Jul 2023 21:10:30 +0800 Subject: [PATCH 6/7] ... --- webapp/controller/HeroController.class.php | 1 + webapp/controller/MarketController.class.php | 1 + webapp/controller/PassController.class.php | 2 ++ webapp/controller/ShopController.class.php | 5 ++++- webapp/models/BcOrder.php | 1 + 5 files changed, 9 insertions(+), 1 deletion(-) diff --git a/webapp/controller/HeroController.class.php b/webapp/controller/HeroController.class.php index 6d260d09..ac824e03 100644 --- a/webapp/controller/HeroController.class.php +++ b/webapp/controller/HeroController.class.php @@ -557,6 +557,7 @@ class HeroController extends BaseAuthedController { BcOrder::upsert($response['trans_id'], array( 'item_id' => V_ITEM_RESET_CARD, 'item_num' => 1, + 'price' => $price, 'ext_data' => json_encode($hero_unnid), )); $this->_rspData($response); diff --git a/webapp/controller/MarketController.class.php b/webapp/controller/MarketController.class.php index 47890863..58847c27 100644 --- a/webapp/controller/MarketController.class.php +++ b/webapp/controller/MarketController.class.php @@ -1200,6 +1200,7 @@ class MarketController extends BaseAuthedController 'item_id' => $item_id, 'item_num' => $item_count, 'order_type' => 1, + 'price' => $goods['s_price'], 'ext_data' => json_encode(array( 'mode' => SHOP_BUY_MODE_NORMAL, )), diff --git a/webapp/controller/PassController.class.php b/webapp/controller/PassController.class.php index 7dd99ae8..72a6991f 100644 --- a/webapp/controller/PassController.class.php +++ b/webapp/controller/PassController.class.php @@ -213,6 +213,7 @@ class PassController extends BaseAuthedController BcOrder::upsert($response['trans_id'], array( 'item_id' => V_ITEM_PASS, 'item_num' => 1, + 'price' => $price, )); $this->_rspData($response); } @@ -242,6 +243,7 @@ class PassController extends BaseAuthedController BcOrder::upsert($response['trans_id'], array( 'item_id' => V_ITEM_EXP, 'item_num' => $passMeta['total_exp'] - $this->userInfo['exp'], + 'price' => $price, )); $this->_rspData($response); } diff --git a/webapp/controller/ShopController.class.php b/webapp/controller/ShopController.class.php index 6bb9778b..57d8e1b6 100644 --- a/webapp/controller/ShopController.class.php +++ b/webapp/controller/ShopController.class.php @@ -667,6 +667,7 @@ class ShopController extends BaseAuthedController 'item_id' => $item_id, 'item_num' => $item_count, 'order_type' => 1, + 'price' => $goods_num * $need_price, 'ext_data' => json_encode(array( 'mode' => SHOP_BUY_MODE_NORMAL, 'shop_id' => $row['shop_id'], @@ -706,7 +707,7 @@ class ShopController extends BaseAuthedController $price = $this->normalizeWeb3Price($num); $item_id = V_ITEM_DIAMOND; $item_count = $num; - + error_log("buy diamond start " . $num); $response = services\BlockChainService::gameItemMallBuy( @@ -720,6 +721,7 @@ class ShopController extends BaseAuthedController 'item_id' => $item_id, 'item_num' => $item_count, 'order_type' => 1, + 'price' => $num, 'ext_data' => json_encode(array( 'mode' => SHOP_BUY_MODE_NORMAL, )), @@ -911,6 +913,7 @@ class ShopController extends BaseAuthedController 'item_id' => $item_id, 'item_num' => $item_count, 'order_type' => 1, + 'price' => $goods['price'] * $count, 'ext_data' => json_encode(array( 'mode' => SHOP_BUY_MODE_DAILY_SELECTION, 'idx' => $idx, diff --git a/webapp/models/BcOrder.php b/webapp/models/BcOrder.php index a1cdd21d..61af55b1 100644 --- a/webapp/models/BcOrder.php +++ b/webapp/models/BcOrder.php @@ -30,6 +30,7 @@ class BcOrder 'ext_data' => getXVal($fieldsKv,'ext_data',''), 'createtime' => myself()->_getNowTime(), 'modifytime' => myself()->_getNowTime(), + 'price' => $fieldsKv['price'], ) ); } From 039edab430c7993de7c8cae8293b87c025b13ca2 Mon Sep 17 00:00:00 2001 From: songliang Date: Fri, 7 Jul 2023 21:49:00 +0800 Subject: [PATCH 7/7] ... --- webapp/services/callback/BuyShopGoodsCbService.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/webapp/services/callback/BuyShopGoodsCbService.php b/webapp/services/callback/BuyShopGoodsCbService.php index ef61194e..ce3ed90f 100644 --- a/webapp/services/callback/BuyShopGoodsCbService.php +++ b/webapp/services/callback/BuyShopGoodsCbService.php @@ -76,13 +76,17 @@ class BuyShopGoodsCbService $address = $order['address']; $item_id = $order['item_id']; $item_num = $order['item_num']; + $id = null; + if (isset($ext_data['id'])) { + $id = $ext_data['id']; + } error_log("callback buynormal address: $address, order_id: $order_id, goods_id: $item_id, goods_num: $item_num"); $this->_addGoods($address, array( 'goods_id' => $item_id, 'goods_num' => $item_num, - 'id' => $ext_data['id'], + 'id' => $id, )); }