From a1517c1aba8adfca50494a9b715a5e42f7431e00 Mon Sep 17 00:00:00 2001
From: lewis <604446095@qq.com>
Date: Fri, 7 Feb 2025 11:31:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=98=AF=E5=90=A6=E5=90=88?=
 =?UTF-8?q?=E5=B9=B6=E9=87=87=E8=B4=AD=E5=8D=95=E5=95=86=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../logic/purchase_product_offer/PurchaseProductOfferLogic.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/admin/logic/purchase_product_offer/PurchaseProductOfferLogic.php b/app/admin/logic/purchase_product_offer/PurchaseProductOfferLogic.php
index 1a06454eb..ca9e9a33a 100644
--- a/app/admin/logic/purchase_product_offer/PurchaseProductOfferLogic.php
+++ b/app/admin/logic/purchase_product_offer/PurchaseProductOfferLogic.php
@@ -60,9 +60,8 @@ class PurchaseProductOfferLogic extends BaseLogic
             if ($mark == '') {
                 $mark = BeforehandOrderCartInfo::where('bhoid', $params['order_id'])->where('product_id', $params['product_id'])->value('mark');
             }
-            $find = StoreProduct::where('id', $params['product_id'])->withTrashed()->find();
             $purchaseProductOffer = PurchaseProductOffer::where(['order_id' => $procurementOrder['id'], 'product_id' => $params['product_id']])->find();
-            if ($purchaseProductOffer) {
+            if (isset($params['merge_product']) && $params['merge_product'] == 1 && $purchaseProductOffer) {
                 $purchaseProductOffer->need_num = $purchaseProductOffer['need_num'] + $params['need_num'];
                 if (!empty($purchaseProductOffer['source_order_info'])) {
                     $sourceOrderInfo = $purchaseProductOffer['source_order_info'];