From 374a902a3ddb1e61b651c82c95669c45f94976e0 Mon Sep 17 00:00:00 2001
From: xucong <850806214@qq.com>
Date: Mon, 16 Sep 2024 22:53:23 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=9C=AC=E5=9C=B0=E7=94=9F=E6=B4=BB=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/logic/LocalStoreLogic.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/api/logic/LocalStoreLogic.php b/app/api/logic/LocalStoreLogic.php
index 1dbc71db..974aed29 100644
--- a/app/api/logic/LocalStoreLogic.php
+++ b/app/api/logic/LocalStoreLogic.php
@@ -218,10 +218,11 @@ class LocalStoreLogic extends Logic
         if(!empty($post['state'])){
             $s = "state=". $post['state'];
         }
-        $list = LocalGoodsStore::where(['user_id' => $post['user_id'], 'state' => 3])
+        $list = LocalGoodsStore::where(['user_id' => $post['user_id']])
             ->where($s)
+            ->where("state <> 3")
             ->page($post['page_no'], $post['page_size'])
-
+            ->order('dtime desc')
             ->select()
             ->toArray();
         foreach($list as $key=>$value){
@@ -247,10 +248,11 @@ class LocalStoreLogic extends Logic
         if(!empty($post['state'])){
             $s = "state=". $post['state'];
         }
-        $list = LocalGoodsStore::where(['lstore_id' => $post['lstore_id'], 'state' => 3])
+        $list = LocalGoodsStore::where(['lstore_id' => $post['lstore_id']])
             ->where($s)
+            ->where("state <> 3")
             ->page($post['page_no'], $post['page_size'])
-           
+            ->order('dtime desc')
             ->select()
             ->toArray();
         foreach($list as $key=>$value){