diff --git a/app/Service/OrderService.php b/app/Service/OrderService.php index 6bb990b..1df6f94 100644 --- a/app/Service/OrderService.php +++ b/app/Service/OrderService.php @@ -964,7 +964,9 @@ class OrderService implements OrderServiceInterface $state = explode(',', $state); $builder = $builder->whereIn('state', $state); } - $orders = $builder->get()->forPage($page, $pagesize)->toArray(); + $orders = $builder->orderBy('id', 'desc') + ->orderBy('state', 'asc') + ->get()->forPage($page, $pagesize)->toArray(); foreach ($orders as $key => &$order) { // 市场名称 diff --git a/app/Service/PurchaseLimitService.php b/app/Service/PurchaseLimitService.php index a75b85e..c221b15 100644 --- a/app/Service/PurchaseLimitService.php +++ b/app/Service/PurchaseLimitService.php @@ -20,7 +20,7 @@ class PurchaseLimitService implements PurchaseLimitServiceInterface { public function getStoreIdByMarketId($params) { - $res = [ + $res[] = [ 'id' => 7, 'item' => 1, 'item_text' => 'page', @@ -29,6 +29,15 @@ class PurchaseLimitService implements PurchaseLimitServiceInterface 'src' => '/zh_cjdianc/pages/takeout/takeoutindex?storeid=123', 'src2' => '/zh_cjdianc/pages/takeout/takeoutindex?storeid=123', ]; + $res[] = [ + 'id' => 8, + 'item' => 1, + 'item_text' => 'page', + 'logo' => 'http://lanzutest.lanzulive.com/attachment/images/2/2020/08/PY55Y3Mz17yJo17rv1Z7vImX1V5159.jpg', + 'redirect_url' => '/zh_cjdianc/pages/takeout/takeoutindex?storeid=109', + 'src' => '/zh_cjdianc/pages/takeout/takeoutindex?storeid=109', + 'src2' => '/zh_cjdianc/pages/takeout/takeoutindex?storeid=109', + ]; return $res; }