From 04d795619cac2e2fda32a29f7868dc3f0cabe5a7 Mon Sep 17 00:00:00 2001
From: Lemon <15040771@qq.com>
Date: Wed, 21 Oct 2020 14:54:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=89=93=E5=8D=B0=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=20=E5=BA=97=E9=93=BA=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Service/v3/Implementations/FeiePrintService.php | 1 -
 app/Service/v3/Implementations/StoreService.php     | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/Service/v3/Implementations/FeiePrintService.php b/app/Service/v3/Implementations/FeiePrintService.php
index a8aa0fd..42b48d6 100644
--- a/app/Service/v3/Implementations/FeiePrintService.php
+++ b/app/Service/v3/Implementations/FeiePrintService.php
@@ -64,7 +64,6 @@ class FeiePrintService implements FeiePrintServiceInterface
                         $query->with('store','orderGoods');
                     }
                 ])->where('global_order_id',$globalOrderId)->first();
-        $this->log->event('feieprint_rpc', ['order_data' => json_encode($data)]);
         if (empty($data)) {
             return ;
         }
diff --git a/app/Service/v3/Implementations/StoreService.php b/app/Service/v3/Implementations/StoreService.php
index 1935940..50cb0fc 100644
--- a/app/Service/v3/Implementations/StoreService.php
+++ b/app/Service/v3/Implementations/StoreService.php
@@ -62,7 +62,7 @@ class StoreService implements StoreServiceInterface
     {
         $market = Market::query()->withoutGlobalScope('normal')->find($marketId);
         $builder = Store::query();
-        $paginate = $builder->where('market_id',$marketId)->paginate($pagesize);
+        $paginate = $builder->where('market_id',$marketId)->orderBy('is_rest', 'asc')->paginate($pagesize);
         $stores = $paginate->toArray();
         $market->stores = $stores['data'];
         return ['has_more_pages' => $paginate->hasMorePages(), 'market' => $market];