From 991dec0760d06c710ef6032bd5753184979d648e Mon Sep 17 00:00:00 2001
From: liu <1873441552@qq.com>
Date: Mon, 17 Jun 2024 17:53:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=B4=BB=E5=8A=A8=E4=BB=B7?=
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 20fe8d78..78dc8227 100644
--- a/app/api/logic/order/OrderLogic.php
+++ b/app/api/logic/order/OrderLogic.php
@@ -85,11 +85,11 @@ class OrderLogic extends BaseLogic
                 $cart_select[$k]['total_price'] = bcmul($v['cart_num'], $find['price'], 2); //订单总价
                 $cart_select[$k]['deduction_price'] =self::$activity_price;//抵扣金额
 
-                if ($user && $user['user_ship'] == 4) {
-                    $deduction_price_count=bcmul(bcsub($find['price'], $find['purchase'], 2),$v['cart_num'],2);
-                    $cart_select[$k]['deduction_price'] =$deduction_price_count;
-                    self::$activity_price = bcadd(self::$activity_price, $deduction_price_count, 2);
-                }                
+//                if ($user && $user['user_ship'] == 4) {
+//                    $deduction_price_count=bcmul(bcsub($find['price'], $find['purchase'], 2),$v['cart_num'],2);
+//                    $cart_select[$k]['deduction_price'] =$deduction_price_count;
+//                    self::$activity_price = bcadd(self::$activity_price, $deduction_price_count, 2);
+//                }
                 //利润
                 // $cart_select[$k]['profit'] = bcmul($v['cart_num'], $onePrice, 2); //利润
                 $cart_select[$k]['purchase'] = bcmul($v['cart_num'], $find['purchase'], 2) ?? 0; //成本