From d5301bf8fcfd67d1287e23a0a61231ec6c9e2620 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Fri, 18 Oct 2024 16:46:59 +0800
Subject: [PATCH] =?UTF-8?q?refactor(warehouse):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E4=BB=93=E5=BA=93=E8=AE=A2=E5=8D=95=E6=8E=A7=E5=88=B6=E5=99=A8?=
 =?UTF-8?q?=E4=B8=AD=E7=9A=84=E4=BB=B7=E6=A0=BC=E8=AE=A1=E7=AE=97=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 注释掉了根据不同订单类型计算价格和总价的代码块
- 保留了默认情况下的总价计算逻辑
- 此修改简化了代码结构，便于后续维护和扩展
---
 .../WarehouseOrderController.php              | 31 ++++++++++---------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/app/admin/controller/warehouse_order/WarehouseOrderController.php b/app/admin/controller/warehouse_order/WarehouseOrderController.php
index a614eb23a..4b1f354a6 100644
--- a/app/admin/controller/warehouse_order/WarehouseOrderController.php
+++ b/app/admin/controller/warehouse_order/WarehouseOrderController.php
@@ -236,21 +236,22 @@ class WarehouseOrderController extends BaseAdminController
             }
             $value->store_name = $find['store_name'] ?? '';
             $value->store_info = $find['store_info'] ?? '';
-            if($type==2){
-                $value->price = $value['purchase'];
-                $value->total_price=bcmul($value['purchase'],$value['nums'],2);
-                $total_price+=$value->total_price;
-            }elseif($type==3){
-                $value->price = $find['cost'];
-                $value->total_price=bcmul($find['cost'],$value['nums'],2);
-                $total_price+=$value->total_price;
-            }elseif($type==4){
-                $value->price = $find['price'];
-                $value->total_price=bcmul($find['price'],$value['nums'],2);
-                $total_price+=$value->total_price;
-            }else{
-                $value->price = $value['purchase'];
-            }
+            // if($type==2){
+            //     $value->price = $value['purchase'];
+            //     $value->total_price=bcmul($value['purchase'],$value['nums'],2);
+            //     $total_price+=$value->total_price;
+            // }elseif($type==3){
+            //     $value->price = $find['cost'];
+            //     $value->total_price=bcmul($find['cost'],$value['nums'],2);
+            //     $total_price+=$value->total_price;
+            // }elseif($type==4){
+            //     $value->price = $find['price'];
+            //     $value->total_price=bcmul($find['price'],$value['nums'],2);
+            //     $total_price+=$value->total_price;
+            // }else{
+                $total_price+=$value['price']->total_price;
+
+            // }
             $value->cart_num = $value['nums'];
             if (!empty($find['unit'])) {
                 $value->unit_name = StoreProductUnit::where('id', $find['unit'])->value('name');