From 76dab72a8e6bba759f07aaebff88ee4f3b4f8616 Mon Sep 17 00:00:00 2001
From: codeliu <1873441552@qq.com>
Date: Fri, 22 Mar 2024 16:22:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=AB=E7=A0=81=E6=8F=90=E8=B4=A7=E9=99=90?=
 =?UTF-8?q?=E5=88=B6=E8=B4=AD=E7=89=A9=E8=BD=A6=E4=BC=9A=E6=9C=89=E6=A3=80?=
 =?UTF-8?q?=E6=B5=8B=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/api/store/order/StoreOrder.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/controller/api/store/order/StoreOrder.php b/app/controller/api/store/order/StoreOrder.php
index 859bd3e9..76867ffa 100644
--- a/app/controller/api/store/order/StoreOrder.php
+++ b/app/controller/api/store/order/StoreOrder.php
@@ -331,14 +331,17 @@ class StoreOrder extends BaseController
             //初始化
             return app('json')->success($this->repository->beginMerchant($merId));
         }
-
+        //购物车有检测机制
         $where = [
             "a.mer_id" => $merId,
-            "p.is_show" => 1,
-            "p.status" => 1,
-            "p.is_gift_bag" => 0
+            "p.is_show" => 1,   // 上架
+            "p.is_used" => 1,// 显示
+            "p.product_type" => 0,// 普通商品
+            "p.status" => 1, // 审核通过
+            "p.is_gift_bag" => 0  //不是礼包
         ];
 
+
         return app('json')->success($this->repository->dealGoodsList($where,$money,$merId));
 
     }