From 617be650576aaae8c4bb23b8951b5e5cd47d7ef4 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Sun, 9 Jun 2024 16:42:38 +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=E6=94=AF=E6=8C=81=E6=96=B0?=
 =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E4=B8=8E=E5=BA=93=E5=AD=98=E8=AE=A1=E7=AE=97?=
 =?UTF-8?q?,=20=E9=87=8D=E6=9E=84=E5=88=A9=E6=B6=A6=E8=AE=A1=E7=AE=97?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/api/logic/order/OrderLogic.php b/app/api/logic/order/OrderLogic.php
index fcae0ef17..29c7e7081 100644
--- a/app/api/logic/order/OrderLogic.php
+++ b/app/api/logic/order/OrderLogic.php
@@ -74,8 +74,7 @@ class OrderLogic extends BaseLogic
 
                 // $productBase = StoreProduct::where('id', $find['product_id'])->withTrashed()->field('price,ot_price,cost')->find();
                 if (isset($check) && $check['status'] == 1) {
-                    self::$activity_price = bcadd(self::$activity_price, bcsub($find['price'],$find['cost'],2), 2);
-                    $find['price'] = $find['cost'];
+                    self::$activity_price = bcadd(self::$activity_price, bcmul($find['price'],0.9,2), 2);
                 }
                 //利润
                 $onePrice = bcsub($find['price'], $find['cost'], 2);
@@ -84,7 +83,7 @@ class OrderLogic extends BaseLogic
                 $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);//钱
-                $cart_select[$k]['product_id'] = $v['goods'];
+                $cart_select[$k]['product_id'] = $v['product_id'];
                 $cart_select[$k]['old_cart_id'] = $v['id'];
                 $cart_select[$k]['cart_num'] = $v['cart_num'];
                 $cart_select[$k]['verify_code'] = $params['verify_code'] ?? '';