From 6a6b142651e71e508f69489a1c1748448315a1be Mon Sep 17 00:00:00 2001
From: lewis <604446095@qq.com>
Date: Thu, 20 Feb 2025 17:58:36 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=87=87=E8=B4=AD?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/controller/LocalController.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/admin/controller/LocalController.php b/app/admin/controller/LocalController.php
index f83debfda..c94abfbeb 100644
--- a/app/admin/controller/LocalController.php
+++ b/app/admin/controller/LocalController.php
@@ -429,6 +429,7 @@ class LocalController extends BaseAdminController
                     'need_num' => $product['nums'],
                     'mark' => $product['mark'] ?? '',
                     'buyer_id' => $params['buyer_id'],
+                    'buyer_confirm' => 1,
                     'buyer_nums' => $product['nums'],
                     'total_price' => $product['purchase_total'],
                     'status' => 0,

From 928ae0013db16d02d6a85a932524ff3746366696 Mon Sep 17 00:00:00 2001
From: lewis <604446095@qq.com>
Date: Fri, 21 Feb 2025 09:37:16 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E6=94=B9=E4=BB=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BeforehandOrderCartInfoLogic.php                          | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/admin/logic/beforehand_order_cart_info/BeforehandOrderCartInfoLogic.php b/app/admin/logic/beforehand_order_cart_info/BeforehandOrderCartInfoLogic.php
index 705e8743f..e1f596a34 100644
--- a/app/admin/logic/beforehand_order_cart_info/BeforehandOrderCartInfoLogic.php
+++ b/app/admin/logic/beforehand_order_cart_info/BeforehandOrderCartInfoLogic.php
@@ -458,7 +458,9 @@ class BeforehandOrderCartInfoLogic extends BaseLogic
             $purchaseProductOffer['purchase']=$purchaseProductOffer['price'];
             $product = StoreProduct::where('id', $purchaseProductOffer['product_id'])->withTrashed()->field('id,store_name,top_cate_id,two_cate_id,cate_id')->find();
 
-            PurchaseProductOfferLogic::setProductGroupPrice($purchaseProductOffer, $product, $params['warehouse_id']);
+            if (!in_array($beforehandOrder['order_type'], [6, 9])) {
+                PurchaseProductOfferLogic::setProductGroupPrice($purchaseProductOffer, $product, $params['warehouse_id']);
+            }
 
             Db::commit();
             return true;