From 9d837a93065b3b8729d49b81a2d7e701e312a031 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Sat, 16 Nov 2024 10:44:43 +0800
Subject: [PATCH] =?UTF-8?q?fix(admin):=20=E4=BF=AE=E5=A4=8D=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E4=BF=A1=E6=81=AF=E8=8E=B7=E5=8F=96=E4=B8=8D=E5=8C=85?=
 =?UTF-8?q?=E5=90=AB=E8=BD=AF=E5=88=A0=E9=99=A4=E6=95=B0=E6=8D=AE=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在多个方法中，为 StoreProduct 查询添加 withTrashed() 方法
- 确保软删除的商品仍然可以被查询到，避免因商品删除导致的订单信息不完整
---
 .../logic/beforehand_order/BeforehandOrderLogic.php  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/admin/logic/beforehand_order/BeforehandOrderLogic.php b/app/admin/logic/beforehand_order/BeforehandOrderLogic.php
index 964d00490..84868cc0e 100644
--- a/app/admin/logic/beforehand_order/BeforehandOrderLogic.php
+++ b/app/admin/logic/beforehand_order/BeforehandOrderLogic.php
@@ -545,7 +545,7 @@ class BeforehandOrderLogic extends BaseLogic
         $order = BeforehandOrder::where('id', $params['id'])->find();
         $order['admin_name'] = Admin::where('id', $order['admin_id'])->value('name');
         $data = BeforehandOrderCartInfo::where('bhoid', $params['id'])->select()->each(function ($item) {
-            $find = StoreProduct::where('id', $item['product_id'])->field('top_cate_id,store_name,unit')->find();
+            $find = StoreProduct::where('id', $item['product_id'])->field('top_cate_id,store_name,unit')->withTrashed()->find();
             $item['top_cate_name'] = StoreCategory::where('id', $find['top_cate_id'])->value('name');
             $item['unit_name'] = StoreProductUnit::where('id', $find['unit'])->value('name');
             $item['store_name'] = $find['store_name'];
@@ -566,7 +566,7 @@ class BeforehandOrderLogic extends BaseLogic
         $order = BeforehandOrder::where('id', $params['id'])->find();
         $order['admin_name'] = Admin::where('id', $order['admin_id'])->value('name');
         $data = BeforehandOrderCartInfo::where('bhoid', $params['id'])->select()->each(function ($item) {
-            $find = StoreProduct::where('id', $item['product_id'])->field('top_cate_id,store_name,unit')->find();
+            $find = StoreProduct::where('id', $item['product_id'])->field('top_cate_id,store_name,unit')->withTrashed()->find();
             $item['unit_name'] = StoreProductUnit::where('id', $find['unit'])->value('name');
             $item['store_name'] = $find['store_name'];
             return $item;
@@ -599,7 +599,7 @@ class BeforehandOrderLogic extends BaseLogic
         $order = BeforehandOrder::where('id', $params['id'])->find();
         $order['admin_name'] = Admin::where('id', $order['admin_id'])->value('name');
         $data = PurchaseProductOffer::where('order_id', $params['id'])->select()->each(function ($item) {
-            $find = StoreProduct::where('id', $item['product_id'])->field('top_cate_id,store_name,unit,gross_weight,net_weight')->find();
+            $find = StoreProduct::where('id', $item['product_id'])->field('top_cate_id,store_name,unit,gross_weight,net_weight')->withTrashed()->find();
             $item['unit_name'] = StoreProductUnit::where('id', $find['unit'])->value('name');
             $item['buyer_name'] = User::where('id', $item['buyer_id'])->value('real_name');
             $item['store_name'] = $find['store_name'];
@@ -625,7 +625,7 @@ class BeforehandOrderLogic extends BaseLogic
         }
         $order['admin_name'] = Admin::where('id', $order['admin_id'])->value('name');
         $data = WarehouseProduct::where('oid', $order['outbound_id'])->where('nums', '>', 0)->select()->each(function ($item) {
-            $find = StoreProduct::where('id', $item['product_id'])->field('top_cate_id,store_name,unit')->find();
+            $find = StoreProduct::where('id', $item['product_id'])->field('top_cate_id,store_name,unit')->withTrashed()->find();
             $item['unit_name'] = StoreProductUnit::where('id', $find['unit'])->value('name');
             $item['store_name'] = $find['store_name'];
             return $item;
@@ -649,7 +649,7 @@ class BeforehandOrderLogic extends BaseLogic
         $order = BeforehandOrder::where('id', $params['id'])->find();
 
         $data = WarehouseProductReturn::where('bhoid', $order['id'])->where('return_type',1)->select()->each(function ($item) {
-            $find = StoreProduct::where('id', $item['product_id'])->field('top_cate_id,store_name,unit')->find();
+            $find = StoreProduct::where('id', $item['product_id'])->field('top_cate_id,store_name,unit')->withTrashed()->find();
             $item['unit_name'] = StoreProductUnit::where('id', $find['unit'])->value('name');
             $item['store_name'] = $find['store_name'];
             return $item;
@@ -674,7 +674,7 @@ class BeforehandOrderLogic extends BaseLogic
         $order = BeforehandOrder::where('id', $params['id'])->find();
 
         $data = WarehouseProductReturn::where('bhoid', $order['id'])->where('return_type',2)->select()->each(function ($item) {
-            $find = StoreProduct::where('id', $item['product_id'])->field('top_cate_id,store_name,unit')->find();
+            $find = StoreProduct::where('id', $item['product_id'])->field('top_cate_id,store_name,unit')->withTrashed()->find();
             $item['unit_name'] = StoreProductUnit::where('id', $find['unit'])->value('name');
             $item['store_name'] = $find['store_name'];
             return $item;