From 1171ad77381fb2fcd7d2ebea93dbd8489cbf9bf4 Mon Sep 17 00:00:00 2001
From: liu <1873441552@qq.com>
Date: Tue, 4 Jun 2024 16:08:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/order/OrderController.php | 5 +++--
 app/api/lists/order/OrderList.php            | 4 ++--
 app/api/logic/order/OrderLogic.php           | 6 +++---
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/api/controller/order/OrderController.php b/app/api/controller/order/OrderController.php
index 40da7fa4d..59f38090e 100644
--- a/app/api/controller/order/OrderController.php
+++ b/app/api/controller/order/OrderController.php
@@ -75,7 +75,8 @@ class OrderController extends BaseApiController
         $where[] = ['is_opurchase', '=', 0];
         $res = StoreOrder::where($where)->whereDay('create_time', $date)->count();
         return $this->success('ok', ['order_count' => $res]);
-    }
+    }*/
+
     public function order_count()
     {
         $userId = $this->request->userId;
@@ -87,7 +88,7 @@ class OrderController extends BaseApiController
         $where['status'] = 1;
         $receiving = StoreOrder::where($where)->count();
         return $this->success('ok', ['no_pay' => $no_pay, 'waiting' => $waiting, 'receiving' => $receiving]);
-    }*/
+    }
     /**
      * @notes 检测零售订单
      */
diff --git a/app/api/lists/order/OrderList.php b/app/api/lists/order/OrderList.php
index cbefa413e..dca54586a 100644
--- a/app/api/lists/order/OrderList.php
+++ b/app/api/lists/order/OrderList.php
@@ -28,9 +28,9 @@ class OrderList extends BaseAdminDataLists implements ListsSearchInterface
     public function setSearch(): array
     {
         return [
-            '=' => ['paid','status','source'],
+            '=' => ['paid','status'],
             'between_time' => 'create_time',
-            '%like%' => ['number'],
+            '%like%' => ['order_id'],
         ];
     }
 
diff --git a/app/api/logic/order/OrderLogic.php b/app/api/logic/order/OrderLogic.php
index 5ab8c46dc..8ca11fef0 100644
--- a/app/api/logic/order/OrderLogic.php
+++ b/app/api/logic/order/OrderLogic.php
@@ -62,7 +62,7 @@ class OrderLogic extends BaseLogic
                 $cart_select[$k]['product_id'] = $v['goods'];
                 $cart_select[$k]['old_cart_id'] = implode(',', $cartId);
                 $cart_select[$k]['cart_num'] = $v['cart_num'];
-                $cart_select[$k]['verify_code'] = $params['verify_code'];
+                $cart_select[$k]['verify_code'] = $params['verify_code']??'';
                 $cart_select[$k]['cart_info'] = json_encode($cart_select[$k]);
                 //理论上每笔都是拆分了
 //                $cart_select[$k]['name'] = $find['store_name'];
@@ -80,8 +80,8 @@ class OrderLogic extends BaseLogic
                 'total_num' => count($cart_select),//总数
                 'pay_type' => $params['pay_type'] ?? 0,
                 'cart_id' => implode(',', $cartId),
-                'store_id' => $params['store_id'],
-                'shipping_type' => $params['shipping_type']//配送方式 1=快递 ，2=门店自提
+                'store_id' => $params['store_id']??0,
+                'shipping_type' => $params['shipping_type']??1//配送方式 1=快递 ，2=门店自提
 //                'delivery_msg'=>' 预计48小时发货 '
             ];
         } catch (\Exception $e) {