From 3060fa43234b3428a87b073150b90fe69f6c79c6 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Wed, 5 Mar 2025 17:44:21 +0800
Subject: [PATCH] =?UTF-8?q?refactor(admin):=20=E9=87=8D=E6=9E=84=E5=89=8D?=
 =?UTF-8?q?=E7=BD=AE=E8=AE=A2=E5=8D=95=E4=B8=AD=E7=9A=84=E4=BC=9A=E5=91=98?=
 =?UTF-8?q?=E4=BB=B7=E6=A0=BC=E8=8E=B7=E5=8F=96=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 注释掉了原有的根据用户分组获取产品价格的代码
- 修改为直接从 StoreProduct 模型中获取产品的 vip_price 字段
- 使用 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 a92fd526..b421c5ca 100644
--- a/app/admin/logic/beforehand_order/BeforehandOrderLogic.php
+++ b/app/admin/logic/beforehand_order/BeforehandOrderLogic.php
@@ -424,11 +424,11 @@ class BeforehandOrderLogic extends BaseLogic
             $res = WarehouseOrder::create($arr);
             $totalPrice = '0.00';
             foreach ($info as $key => $arr) {
-                if ($user_ship == 0) {
-                    $price = 0;
-                } else {
-                    $price = StoreProductGroupPrice::where('product_id', $arr['product_id'])->where('group_id', $user_ship)->value('price') ?? 0;
-                }
+                // if ($user_ship == 0) {
+                //     $price = 0;
+                // } else {
+                //     $price = StoreProductGroupPrice::where('product_id', $arr['product_id'])->where('group_id', $user_ship)->value('price') ?? 0;
+                // }
                 $data = [
                     'warehouse_id' => $warehouse_id,
                     'product_id' => $arr['product_id'],
@@ -441,7 +441,7 @@ class BeforehandOrderLogic extends BaseLogic
                     'admin_id' => $admin_id,
                     'total_price' => $arr['total_price'],
                     'price' => $arr['price'],
-                    'vip_price' => $price,
+                    'vip_price' => StoreProduct::where('id',$arr['product_id'])->withTrashed()->value('vip_price') ?? 0,
                     'purchase' => $arr['purchase'],
                     'oid' => $res['id'],
                     'code' => $res['code'],