From 1333d13fdf8483208158d27b3e738789040748ac Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Wed, 30 Oct 2024 14:40:51 +0800
Subject: [PATCH] =?UTF-8?q?fix(admin):=20=E4=BC=98=E5=8C=96=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E4=BF=A1=E6=81=AF=E5=A4=84=E7=90=86=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在处理商品信息时，增加了对各个字段的非空判断，只保存不为空的值
- 修改了采购价的处理逻辑，当没有提供采购价时，从 StoreProduct 表中查询最新的采购价
- 保留了原始逻辑中的注释，以便后续参考
---
 .../beforehand_order/BeforehandOrderLogic.php | 36 ++++++++++++++-----
 1 file changed, 27 insertions(+), 9 deletions(-)

diff --git a/app/admin/logic/beforehand_order/BeforehandOrderLogic.php b/app/admin/logic/beforehand_order/BeforehandOrderLogic.php
index 95e51f64b..4af6b1a40 100644
--- a/app/admin/logic/beforehand_order/BeforehandOrderLogic.php
+++ b/app/admin/logic/beforehand_order/BeforehandOrderLogic.php
@@ -102,14 +102,30 @@ class BeforehandOrderLogic extends BaseLogic
                 $datas[$k]['bhoid'] = $order['id'];
                 
                 $data['id']=$v['product_id'];
-                $data['marques']=$v['marques'];
-                $data['store_info']=$v['store_info'];
-                $data['after_sales']=$v['after_sales'];
-                $data['package']=$v['package'];
-                $data['loss']=$v['loss'];
-                $data['gross_weight']=$v['gross_weight'];
-                $data['net_weight']=$v['net_weight'];
-                $data['mark']=$v['mark'];
+                if($v['marques']){
+                    $data['marques']=$v['marques'];
+                }
+                if($v['store_info']){
+                    $data['store_info']=$v['store_info'];
+                }
+                if($v['after_sales']){
+                    $data['after_sales']=$v['after_sales'];
+                }
+                if($v['package']){
+                    $data['package']=$v['package'];
+                }
+                if($v['loss']){
+                    $data['loss']=$v['loss'];
+                }
+                if($v['gross_weight']){
+                    $data['gross_weight']=$v['gross_weight'];
+                }
+                if($v['net_weight']){
+                    $data['net_weight']=$v['net_weight'];
+                }
+                if($v['mark']){
+                    $data['mark']=$v['mark'];
+                }
                 $product_arr[]=$data;
             }
             (new StoreProduct())->saveAll($product_arr);
@@ -155,7 +171,9 @@ class BeforehandOrderLogic extends BaseLogic
                     if (isset($v['purchase']) && $v['purchase'] > 0) {
                         $purchase = $v['purchase'];
                     } else {
-                        $purchase = $v['price'];
+                        $purchase = StoreProduct::where('id', $v['product_id'])->withTrashed()->value('purchase');
+                        $find['purchase']=$purchase;
+                        // $purchase = $v['price'];
                     }
                     $find->save(['price' => $v['price'], 'vip_price' => $v['price'], 'cost' => $v['price'], 'purchase' => $purchase]);
                 }