From 098b431bed66cb93e23cde10a86d8b63e75d0ed0 Mon Sep 17 00:00:00 2001
From: liu <1873441552@qq.com>
Date: Tue, 2 Jul 2024 15:27:00 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E5=95=86=E5=93=81=E5=BA=93=E5=AD=98=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA=E7=9A=84=E7=9B=B8=E5=85=B3=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/api/lists/product/ProductLists.php b/app/api/lists/product/ProductLists.php
index 9d299fedd..422e96207 100644
--- a/app/api/lists/product/ProductLists.php
+++ b/app/api/lists/product/ProductLists.php
@@ -89,10 +89,10 @@ class ProductLists extends BaseAdminDataLists implements ListsSearchInterface, L
         }else{
             $order = [$field => $order];
         }
-        $fields = 'id,product_id,cate_id,store_name,cost,store_id,vip_price,purchase,price,bar_code,image,sales,store_info,delete_time,unit,batch,top_cate_id,two_cate_id';
+        $fields = 'id,product_id,cate_id,store_name,cost,store_id,vip_price,purchase,price,bar_code,image,sales,store_info,delete_time,unit,batch,top_cate_id,two_cate_id,stock';
 
         $this->searchWhere[] = ['status', '=', 1];
-        $this->searchWhere[] = ['stock', '>', 0];
+//        $this->searchWhere[] = ['stock', '>', 0];
         return StoreBranchProduct::where($this->searchWhere)
             ->field($fields)
             ->with(['className', 'unitName'])

From e9ae9ee246892430e55829dcae313f5733e46651 Mon Sep 17 00:00:00 2001
From: liu <1873441552@qq.com>
Date: Tue, 2 Jul 2024 15:29:51 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=8F=96=E6=B6=88=E4=B8=8B=E5=8D=95?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F=E9=99=90=E5=88=B6=E7=9B=B4=E6=8E=A5=E4=B8=BA?=
 =?UTF-8?q?=E6=AC=A1=E6=97=A5=E9=A2=84=E6=8F=90=E5=8D=95=E5=AD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/order/CartController.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/api/controller/order/CartController.php b/app/api/controller/order/CartController.php
index 7496016df..e9ad6d214 100644
--- a/app/api/controller/order/CartController.php
+++ b/app/api/controller/order/CartController.php
@@ -40,13 +40,13 @@ class CartController extends BaseApiController
             return $this->fail('购物车商品不能大于100个，请先结算');
         }
         //数量下单判断
-        $stock = StoreBranchProduct::where(
-            ['product_id'=>$params['product_id'],
-            'store_id'=>$params['store_id']
-            ])->value('stock')??0;
-        if ($params['cart_num'] >$stock) {
-            return $this->fail('库存数量不足');
-        }
+//        $stock = StoreBranchProduct::where(
+//            ['product_id'=>$params['product_id'],
+//            'store_id'=>$params['store_id']
+//            ])->value('stock')??0;
+//        if ($params['cart_num'] >$stock) {
+//            return $this->fail('库存数量不足');
+//        }
         if ($result) {
             if(isset($params['type']) && $params['type'] == 1){
                 $res = CartLogic::add($params);