From 2ceccdbb7d95e99cb6d4cc6e728c65957a2f6536 Mon Sep 17 00:00:00 2001
From: wangxiaowei <wang199765>
Date: Wed, 16 Oct 2024 14:43:11 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E5=86=99=E8=8E=B7=E5=8F=96=E6=9C=AC?=
 =?UTF-8?q?=E5=9C=B0=E5=95=86=E5=AE=B6=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/logic/LocalStoreLogic.php | 37 ++++++++++++-------------------
 1 file changed, 14 insertions(+), 23 deletions(-)

diff --git a/app/api/logic/LocalStoreLogic.php b/app/api/logic/LocalStoreLogic.php
index 76b035fe..c72615eb 100644
--- a/app/api/logic/LocalStoreLogic.php
+++ b/app/api/logic/LocalStoreLogic.php
@@ -110,46 +110,37 @@ class LocalStoreLogic extends Logic
 
     public function getLocalLists($data)
     {
-//        $s = $s1 = $keyword = $keyword1 = "";
-
         $where = [];
+
+        // 城市搜索
         if (isset($data['c_name']) && $data['c_name'] != "") {
             $where[] = ['address', 'like', '%' . $data['c_name'] . '%'];
-//            $s1 = "address like '%" . $data['c_name'] . "%'";
-//            $s = "and address like '%" . $data['c_name'] . "%'";
         }
 
         // 搜索商家名称
         if (isset($data['keyword']) && $data['keyword'] != '') {
             $where[] = ['shopName', 'like', '%' . $data['keyword'] . '%'];
-//            $keyword1 = "shopName like '%" . $data['keyword'] . "%'";
-//            $keyword = "and shopName like '%" . $data['keyword'] . "%'";
         }
 
-        $count = LocalStore::where([
-            'is_delete' => 0,
-            'store_state' => 1,
-            'shopLogo' => 'not null'
-        ])->where($where)->count();
-
-//        $size = $data['page_size'];
-//        $page = ($data['page_no'] - 1) * $data['page_size'];
-
-        $lists = LocalStore::where(['is_delete' => 0, 'store_state' => 1, 'shopLogo' => 'not null'])
+        // 数量统计
+        $count = LocalStore::where(['is_delete' => 0, 'store_state' => 1])
             ->where($where)
+            ->whereNotNull('shopLogo')
+            ->count();
+
+        // 列表
+        $lists = LocalStore::where(['is_delete' => 0, 'store_state' => 1])
+            ->where($where)
+            ->whereNotNull('shopLogo')
             ->order('sort desc')
             ->page($data['page_no'], $data['page_size'])
             ->select();
-        dump($count);
-        dump($lists);
-        die;
-//        $sql = "SELECT * FROM ls_local_store where is_delete = 0 and store_state = 1 and shopLogo is not null $s $keyword ORDER BY sort desc limit " . $page . "," . $size;
-//
-//        $lists = Db::query($sql);
+
         foreach ($lists as $key => &$value) {
             $lists[$key]['distance'] = round($this->distance($data['latitude'], $data['longitude'], $value['latitude'], $value['longitude']) / 1000, 2) . "公里";
             $lists[$key]['store_nickname'] = $value["shopName"];
         }
+
         $data = [
             'list' => $lists,
             'page' => $data['page_no'],
@@ -157,7 +148,7 @@ class LocalStoreLogic extends Logic
             'count' => $count,
             'more' => is_more($count, $data['page_no'], $data['page_size'])
         ];
-//        var_dump($data);
+
         return $data;
     }