From 2439429e4c0124b54c644d28001eb2ab83ee123c Mon Sep 17 00:00:00 2001
From: lewis <604446095@qq.com>
Date: Thu, 3 Apr 2025 14:58:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A2=84=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E9=AB=98=E7=BA=A7=E4=BC=9A=E5=91=98=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../beforehand_order/BeforehandOrderLogic.php | 20 +++++--------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/app/admin/logic/beforehand_order/BeforehandOrderLogic.php b/app/admin/logic/beforehand_order/BeforehandOrderLogic.php
index 18b973f3..170f83c8 100644
--- a/app/admin/logic/beforehand_order/BeforehandOrderLogic.php
+++ b/app/admin/logic/beforehand_order/BeforehandOrderLogic.php
@@ -968,27 +968,17 @@ class BeforehandOrderLogic extends BaseLogic
             $v['store_name'] = $find['store_name'];
             $v['mark'] = $find['after_sales'];
             if (isset($params['type']) && $params['type'] == 2) {
-                $price = $v['purchase'];
-                $v['price'] = $v['cost'];
-                $v['total_price'] = bcmul($v['price'], $v['nums'], 2);
-                $v['pay_price'] = bcmul($price, $v['nums'], 2);
+                $v['price'] = $v['cost']; //出库单价
+                $v['total_price'] = bcmul($v['price'], $v['nums'], 2); //出库总价
             } else {
                 if ($v['vip_price'] > 0) {
-                    $v['pay_price'] = bcmul($v['vip_price'], $v['nums'], 2);
-                    $price = $v['vip_price'];
+                    $v['total_price'] = bcmul($v['vip_price'], $v['nums'], 2);
                 } else {
-                    $price = StoreProductGroupPrice::where('product_id', $v['product_id'])->where('group_id', $user_ship)->value('price');
-                    if ($price > 0) {
-                        $v['pay_price'] = bcmul($price, $v['nums'], 2);
-                    } else {
-                        $price = $find['cost'];
-                        $v['pay_price'] = bcmul($price, $v['nums'], 2);
-                    }
-                    WarehouseProduct::where('id', $v['id'])->update(['vip_price' => $price]);
+                    $v['total_price'] = bcmul($v['price'], $v['nums'], 2);
                 }
             }
 
-            $v['purchase'] = $price;
+            $v['pay_price'] = bcmul($v['purchase'], $v['nums'], 2); //供货总价
             $v['profit'] = bcsub($v['total_price'], $v['pay_price'], 2);
             $total_profit = bcadd($total_profit, $v['profit'], 2);
             $pay_price = bcadd($pay_price, $v['pay_price'], 2);
-- 
2.47.2