From f16a694b72c43e88109ec5da0312dfbf073ea1ba Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Mon, 14 Oct 2024 20:49:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B4=AD=E4=B9=B0=E4=BA=A7?=
 =?UTF-8?q?=E5=93=81=E4=BC=98=E6=83=A0=E8=AE=B0=E5=BD=95=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E6=97=B6=E7=9A=84mark=E5=AD=97=E6=AE=B5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在创建购买产品优惠记录时，如果未提供mark参数，将从预订单购物车信息中获取相应的mark值。此修复确保了当没有直接提供mark值时，能够从关联的预订单购物车信息中正确地获取该值。
---
 .../purchase_product_offer/PurchaseProductOfferLogic.php   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/admin/logic/purchase_product_offer/PurchaseProductOfferLogic.php b/app/admin/logic/purchase_product_offer/PurchaseProductOfferLogic.php
index 25f0c588e..b5ba90181 100644
--- a/app/admin/logic/purchase_product_offer/PurchaseProductOfferLogic.php
+++ b/app/admin/logic/purchase_product_offer/PurchaseProductOfferLogic.php
@@ -5,6 +5,7 @@ namespace app\admin\logic\purchase_product_offer;
 
 use app\common\model\purchase_product_offer\PurchaseProductOffer;
 use app\common\logic\BaseLogic;
+use app\common\model\beforehand_order\BeforehandOrder;
 use app\common\model\beforehand_order_cart_info\BeforehandOrderCartInfo;
 use support\exception\BusinessException;
 use think\facade\Db;
@@ -30,13 +31,17 @@ class PurchaseProductOfferLogic extends BaseLogic
     {
         Db::startTrans();
         try {
+            $mark=$params['mark'] ?? '';
+            if($mark==''){
+                $mark=BeforehandOrderCartInfo::where('bhoid',$params['order_id'])->where('product_id',$params['product_id'])->value('mark');
+            }
             PurchaseProductOffer::create([
                 'order_id' => $params['order_id'],
                 'product_id' => $params['product_id'],
                 'unit' => $params['unit'],
                 'is_buyer' => $params['is_buyer'],
                 'need_num' => $params['need_num'],
-                'mark' => $params['mark'] ?? '',
+                'mark' => $mark,
                 'buyer_id' => $params['buyer_id'],
                 'status' => 0,