From 876d2d8dd941b22b1c2b80d7b42ee638bc39a499 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Sun, 9 Jun 2024 14:57:28 +0800
Subject: [PATCH] =?UTF-8?q?feat(OrderLogic):=20=E4=BF=AE=E6=94=B9=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E9=80=BB=E8=BE=91=E4=BB=A5=E8=AE=A1=E7=AE=97=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E6=88=90=E6=9C=AC=E4=B8=8E=E5=88=A9=E6=B6=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/logic/order/OrderLogic.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/api/logic/order/OrderLogic.php b/app/api/logic/order/OrderLogic.php
index 512f9abaf..b9a0c7527 100644
--- a/app/api/logic/order/OrderLogic.php
+++ b/app/api/logic/order/OrderLogic.php
@@ -64,19 +64,19 @@ class OrderLogic extends BaseLogic
             /** 计算价格 */
             $check = DictType::where('type', 'activities')->find();
             foreach ($cart_select as $k => $v) {
-                $find = StoreBranchProduct::where(['id' => $v['goods']])->field('store_name,image,unit,price,product_id')->find();
+                $find = StoreBranchProduct::where(['id' => $v['goods']])->field('store_name,image,unit,price,cost,product_id')->find();
                 if (!$find) {
                     continue;
                 }
-                $productBase = StoreProduct::where('id', $find['product_id'])->withTrashed()->field('price,ot_price,cost')->find();
+                // $productBase = StoreProduct::where('id', $find['product_id'])->withTrashed()->field('price,ot_price,cost')->find();
                 if (isset($check) && $check['status'] == 1) {
-                    $find['price'] = $productBase['ot_price'];
+                    $find['price'] = $find['cost'];
                 }
                 unset($cart_select[$k]['id']);
                 //利润
-                $onePrice = bcsub($productBase['price'], $productBase['ot_price'], 2);
+                $onePrice = bcsub($find['price'], $find['ot_price'], 2);
                 $cart_select[$k]['profit'] = bcmul($v['cart_num'], $onePrice, 2);//利润
-                $cart_select[$k]['cost'] = bcmul($v['cart_num'], $productBase['cost'], 2) ?? 0;
+                $cart_select[$k]['cost'] = bcmul($v['cart_num'], $find['cost'], 2) ?? 0;
                 $cart_select[$k]['total'] = bcmul($v['cart_num'], $find['price'], 2);//钱
                 $cart_select[$k]['price'] = $find['price'];
                 $cart_select[$k]['total_price'] = bcmul($v['cart_num'], $find['price'], 2);//钱