From 067b9e1911ccec6af3398efbbd42d5dfda959200 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Sun, 9 Jun 2024 15:53:17 +0800
Subject: [PATCH] =?UTF-8?q?refactor(OrderLogic):=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E9=80=BB=E8=BE=91=E4=BB=A5=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E6=96=B0=E6=B4=BB=E5=8A=A8=E4=B8=8E=E5=BA=93=E5=AD=98=E8=AE=A1?=
 =?UTF-8?q?=E7=AE=97,=20=E9=87=8D=E6=9E=84=E5=88=A9=E6=B6=A6=E8=AE=A1?=
 =?UTF-8?q?=E7=AE=97=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 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/api/logic/order/OrderLogic.php b/app/api/logic/order/OrderLogic.php
index f426558ad..90810ef67 100644
--- a/app/api/logic/order/OrderLogic.php
+++ b/app/api/logic/order/OrderLogic.php
@@ -74,7 +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, bcmul($find['price'],$find['cost'],2), 2);
+                    self::$activity_price = bcadd(self::$activity_price, bcsub($find['price'],$find['cost'],2), 2);
                     $find['price'] = $find['cost'];
                 }
                 //利润
@@ -162,7 +162,7 @@ class OrderLogic extends BaseLogic
                 'cart_id' => implode(',', $cartId),
                 'store_id' => $params['store_id'] ?? 0,
                 'shipping_type' => $params['shipping_type'] ?? 1,//配送方式 1=快递 ，2=门店自提
-                'activity' =>'九折',
+                'activity' =>'减免',
                 'activity_price' =>self::$activity_price,
                 'activities'=>$check,
             ];