diff --git a/doc/Market.py b/doc/Market.py index bf9eb6ab..57afeb39 100644 --- a/doc/Market.py +++ b/doc/Market.py @@ -346,7 +346,8 @@ class Market(object): ['lv_filter', 0, '等级过滤'], ['quality_filter', 0, '品阶顾虑'], ['durability_filter', 0, '能量过滤'], - ['price_filter', '', '价格过滤(用|分割)'] + ['price_filter', '', '价格过滤(用|分割)'], + ['amount_filter', '', '数量过滤(low:top)'] ], 'response': [ _common.RspHead(), diff --git a/webapp/controller/MarketController.class.php b/webapp/controller/MarketController.class.php index bc9560f9..59e15331 100644 --- a/webapp/controller/MarketController.class.php +++ b/webapp/controller/MarketController.class.php @@ -767,6 +767,8 @@ class MarketController extends BaseAuthedController $lv_filter = getReqVal('lv_filter', 0); $quality_filter = getReqVal('quality_filter', 0); $durability_filter = getReqVal('durability_filter', 0); + $amount_filter = getReqVal('amount_filter', 0); + $amount_filter_array = explode('|', $amount_filter); $price_filter = getReqVal('price_filter', ''); $price_filter_array = explode('|', $price_filter); @@ -792,6 +794,14 @@ class MarketController extends BaseAuthedController } return ''; }; + $amount_filter_fn = function ($f) { + if (count($f) == 2) { + $low = $f[0]; + $top = $f[1]; + return 'AND amount>=' . $low . ' AND amount<=' . $top . ' '; + } + return ''; + }; $lv_filter_fn = function ($f) { $f = (int) $f; return 'AND c_lv>=' . $f . ' '; @@ -853,6 +863,7 @@ class MarketController extends BaseAuthedController $quality_filter_fn($quality_filter) . $durability_filter_fn($durability_filter) . $price_filter_fn($price_filter_array) . + $amount_filter_fn($amount_filter_array) . $search_filter_fn($search_filter_array) . $order_fn($order_method, $order_asc), array( @@ -877,6 +888,7 @@ class MarketController extends BaseAuthedController $quality_filter_fn($quality_filter) . $durability_filter_fn($durability_filter) . $price_filter_fn($price_filter_array) . + $amount_filter_fn($amount_filter_array) . $search_filter_fn($search_filter_array) . $order_fn($order_method, $order_asc) . 'LIMIT ' . $start . ',' . $page_size, @@ -1173,7 +1185,7 @@ class MarketController extends BaseAuthedController $item_id = $goods['item_id']; $item_count = $goods['amount']; - + BcOrder::upsert($response['trans_id'], array( 'item_id' => $item_id, 'item_num' => $item_count,