From 8a54e68d8a996ebeef1e8ce9d2545e04a046502a Mon Sep 17 00:00:00 2001
From: liu <1873441552@qq.com>
Date: Wed, 12 Jun 2024 15:11:32 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/lists/product/ProductLists.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/api/lists/product/ProductLists.php b/app/api/lists/product/ProductLists.php
index bc82f94b4..f965cd7d6 100644
--- a/app/api/lists/product/ProductLists.php
+++ b/app/api/lists/product/ProductLists.php
@@ -30,18 +30,18 @@ class ProductLists extends BaseAdminDataLists implements ListsSearchInterface,Li
      */
     public function setSearch(): array
     {
-        $name=$this->request->get('name','');
+        $name=$this->request->get('store_name','');
         //            $where['%pipe_like%'] =['name'=>'store_name|bar_code'];
         if($name){
             if(preg_match('/[\x{4e00}-\x{9fff}]+/u', $name)==1){
-                $where['%like%']=['store_name'];
+//                $where['%like%']=['name'=>'store_name'];
+                $where['%like%']=['store_name'=>'store_name'];
             }else{
                 $where['=']=['bar_code','cate_id'];
             }
         }else{
             $where['=']=['store_id','bar_code','cate_id'];
         }
-
         return $where;
     }
     /**

From a75d9fb64e64260a450854f7fb25b09590cbf08b Mon Sep 17 00:00:00 2001
From: liu <1873441552@qq.com>
Date: Tue, 25 Jun 2024 09:54:34 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/logic/user/AddressLogic.php             | 12 +++++++++---
 app/store/controller/user/AddressController.php |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/app/api/logic/user/AddressLogic.php b/app/api/logic/user/AddressLogic.php
index c2393319b..75f7003c6 100644
--- a/app/api/logic/user/AddressLogic.php
+++ b/app/api/logic/user/AddressLogic.php
@@ -59,14 +59,15 @@ class AddressLogic extends BaseLogic
     {
         Db::startTrans();
         try {
-            if($params['is_default']==1){
+            $is_default = $params['is_default']??0;
+            if($is_default){
                 UserAddress::where('uid',$params['uid'])->update(['is_default'=>0]);
             }
             $data = [
                 'real_name' => $params['real_name'],
                 'phone' => $params['phone'],
-                'detail' => $params['detail'],
-                'is_default' => $params['is_default'],
+                'detail' => $params['detail']??'',
+                'is_default' => $params['is_default']??0,
                 'province' => $params['province'],
                 'city' => $params['city'],
                 'area' => $params['area'],
@@ -109,4 +110,9 @@ class AddressLogic extends BaseLogic
     {
         return UserAddress::field('id,real_name,phone,province,city,area,street,village,brigade,detail,is_default')->where('id',$params['address_id'])->findOrEmpty()->toArray();
     }
+
+    public static function info($params): array
+    {
+        return UserAddress::field('id,real_name,phone,province,city,area,street,village,brigade,detail,is_default')->where($params)->findOrEmpty()->toArray();
+    }
 }
diff --git a/app/store/controller/user/AddressController.php b/app/store/controller/user/AddressController.php
index b3a74cf8b..5563dc142 100644
--- a/app/store/controller/user/AddressController.php
+++ b/app/store/controller/user/AddressController.php
@@ -44,6 +44,6 @@ class AddressController extends BaseAdminController
         if($uid){
             $params = ['uid' => $uid];
         }
-        return $this->success('获取成功',AddressLogic::detail($params));
+        return $this->success('获取成功',AddressLogic::info($params));
     }
 }