Commit b41f6f88 authored by zw's avatar zw

1

parent e887cf2c
...@@ -69,10 +69,10 @@ class Square extends Basic ...@@ -69,10 +69,10 @@ class Square extends Basic
public function getSquareSortList() public function getSquareSortList()
{ {
$params = $this->params; $params = $this->params;
/* $params = array( /* $params = array(
"page_no" => 1, "page_no" => 1,
"page_size" => 15, "page_size" => 15,
"site_id" => 1, "site_id" => 10001,
);*/ );*/
$pageNo = empty($params['page_no']) ? 1 : $params['page_no']; $pageNo = empty($params['page_no']) ? 1 : $params['page_no'];
$pageSize = empty($params['page_size']) ? 15 : $params['page_size']; $pageSize = empty($params['page_size']) ? 15 : $params['page_size'];
......
...@@ -135,20 +135,20 @@ class SquareSortService ...@@ -135,20 +135,20 @@ class SquareSortService
$index_max = $page_no * $page_size; $index_max = $page_no * $page_size;
$result = []; $result = [];
if ($total <= $page_size) { if ($total <= $page_size) {
$cream_list = $this->redis->zRange(self::SORT_KEY_CREAM . $site_id, 0, -1, true); $cream_list = $this->redis->zRevRange(self::SORT_KEY_CREAM . $site_id, 0, -1, true);
$list = $this->redis->zRange(self::SORT_KEY . $site_id, 0, -1, true); $list = $this->redis->zRevRange(self::SORT_KEY . $site_id, 0, -1, true);
$result = $cream_list + $list; $result = $cream_list + $list;
} elseif ($index_min <= $cream_num && $index_max <= $cream_num) { } elseif ($index_min <= $cream_num && $index_max <= $cream_num) {
$cream_list = $this->redis->zRange(self::SORT_KEY_CREAM . $site_id, $index_min, $page_size, true); $cream_list = $this->redis->zRevRange(self::SORT_KEY_CREAM . $site_id, $index_min, $page_size, true);
$result = $cream_list; $result = $cream_list;
} elseif ($index_min <= $cream_num && $index_max > $cream_num) { } elseif ($index_min <= $cream_num && $index_max > $cream_num) {
$residue = $index_max - $cream_num; $residue = $index_max - $cream_num;
$cream_list = $this->redis->zRange(self::SORT_KEY_CREAM . $site_id, $index_min, -1, true); $cream_list = $this->redis->zRevRange(self::SORT_KEY_CREAM . $site_id, $index_min, -1, true);
$list = $this->redis->zRange(self::SORT_KEY . $site_id, 0, $residue, true); $list = $this->redis->zRevRange(self::SORT_KEY . $site_id, 0, $residue, true);
$result = $cream_list + $list; $result = $cream_list + $list;
} elseif ($index_min > $cream_num) { } elseif ($index_min > $cream_num) {
$index_ = $index_min - $cream_num; $index_ = $index_min - $cream_num;
$list = $this->redis->zRange(self::SORT_KEY . $site_id, $index_, $page_size, true); $list = $this->redis->zRevRange(self::SORT_KEY . $site_id, $index_, $page_size, true);
$result = $list; $result = $list;
} }
return $result; return $result;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment