From a1b54043d2a8ed4d75a158b385b280a46b2b095c Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Thu, 13 Jun 2024 16:09:31 +0800
Subject: [PATCH] =?UTF-8?q?feat(StoreOrderLogic):=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E9=80=BB=E8=BE=91=EF=BC=8C=E7=AE=80=E5=8C=96?=
 =?UTF-8?q?=E6=8A=98=E6=89=A3=E8=AE=A1=E7=AE=97=EF=BC=8C=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E5=88=A9=E6=B6=A6=E8=AE=A1=E7=AE=97=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/logic/store_order/StoreOrderLogic.php | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/app/common/logic/store_order/StoreOrderLogic.php b/app/common/logic/store_order/StoreOrderLogic.php
index 7b067a90d..b16abf813 100644
--- a/app/common/logic/store_order/StoreOrderLogic.php
+++ b/app/common/logic/store_order/StoreOrderLogic.php
@@ -48,7 +48,7 @@ class StoreOrderLogic extends BaseLogic
             /** 计算价格 */
             $check = DictType::where('type', 'activities')->find();
             foreach ($cart_select as $k => $v) {
-                $find = StoreBranchProduct::where(['product_id' => $v['product_id'],'store_id'=>$params['store_id']])->field('id branch_product_id,store_name,image,unit,price,cost,product_id')->find();
+                $find = StoreBranchProduct::where(['product_id' => $v['product_id'],'store_id'=>$params['store_id']])->field('id branch_product_id,store_name,image,unit,cost price,cost,product_id')->find();
                 if (!$find) {
                     continue;
                 }
@@ -57,17 +57,9 @@ class StoreOrderLogic extends BaseLogic
                 $cart_select[$k]['price'] = $find['price'];
                 $cart_select[$k]['total_price'] = bcmul($v['cart_num'], $find['price'], 2); //订单总价
                 $cart_select[$k]['deduction_price'] =self::$activity_price;//抵扣金额
-                if (isset($check) && $check['status'] == 1) {
-                    //零售价*折扣率
-                    $activity_price = bcmul($find['price'], 0.9, 2);
-                    $deduction_price_count=bcmul(bcsub($find['price'], $activity_price, 2),$v['cart_num'], 2);
-                    $cart_select[$k]['deduction_price'] =$deduction_price_count;
-                    self::$activity_price = bcadd(self::$activity_price, $deduction_price_count, 2);
-                    $find['price'] = $activity_price;
-                }
+       
                 //利润
-                $onePrice = bcsub($find['price'], $find['cost'], 2);
-                $cart_select[$k]['profit'] = bcmul($v['cart_num'], $onePrice, 2); //利润
+                $cart_select[$k]['profit'] = bcmul($cart_select[$k]['total_price'],0.05,2); //利润
                 $cart_select[$k]['cost'] = bcmul($v['cart_num'], $find['cost'], 2) ?? 0; //成本
                 $cart_select[$k]['pay_price'] = bcmul($v['cart_num'], $find['price'], 2); //订单支付金额
                 $cart_select[$k]['product_id'] = $find['product_id'];