From fcaf009427130c56c6d1435de992fc69f8f18e84 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Fri, 23 Aug 2024 17:25:03 +0800
Subject: [PATCH] =?UTF-8?q?feat(WarehouseOrderController):=20=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E4=BA=86=E8=AE=A1=E7=AE=97=E8=AE=A2=E5=8D=95=E6=80=BB?=
 =?UTF-8?q?=E4=BB=B7=E7=9A=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/warehouse_order/WarehouseOrderController.php  | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/admin/controller/warehouse_order/WarehouseOrderController.php b/app/admin/controller/warehouse_order/WarehouseOrderController.php
index a37b3a32..40ef4ffc 100644
--- a/app/admin/controller/warehouse_order/WarehouseOrderController.php
+++ b/app/admin/controller/warehouse_order/WarehouseOrderController.php
@@ -215,6 +215,7 @@ class WarehouseOrderController extends BaseAdminController
         $system_store = SystemStore::where('id', $order['store_id'])->value('name');
         $data = WarehouseProduct::where('oid', $id)->select();
         $order['total_num'] = 0;
+        $total_price=0;
         foreach ($data as $key => &$value) {
             $find = StoreProduct::where('id', $value->product_id)->find();
             $value->store_name = $find['store_name'] ?? '';
@@ -222,6 +223,7 @@ class WarehouseOrderController extends BaseAdminController
             if($type==2){
                 $value->price = $find['price'];
                 $value->total_price=bcmul($find['price'],$value['nums'],2);
+                $total_price+=$value->total_price;
             }else{
                 $value->price = $value['purchase'];
             }
@@ -233,6 +235,9 @@ class WarehouseOrderController extends BaseAdminController
             }
             $order['total_num'] += $value->nums;
         }
+        if($type==2){
+            $order['total_price']=$total_price;
+        }
         $order['delivery_time']=date('Y-m-d H:i:s',$order['delivery_time']);
         $order['pay_time']=$order['create_time'];
         $order['order_id']=$order['code'];