From 26dd7aaeb7aa96ef0b7f405a20cd6cc2a8761866 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Tue, 23 Jul 2024 09:13:27 +0800
Subject: [PATCH] =?UTF-8?q?feat(order):=20=E8=B0=83=E6=95=B4=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E9=80=BB=E8=BE=91=E4=BC=98=E5=85=88=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/api/logic/order/OrderLogic.php b/app/api/logic/order/OrderLogic.php
index b5f68b8ea..91258b100 100644
--- a/app/api/logic/order/OrderLogic.php
+++ b/app/api/logic/order/OrderLogic.php
@@ -113,7 +113,7 @@ class OrderLogic extends BaseLogic
                 } else {
                     $price = $find['price'];
                 }
-                if($off_activity==0 && $user&&$user['user_ship']==5 && $find['top_cate_id']==15189){
+                if($off_activity==0 && $find['top_cate_id']==15189 && $user&&$user['user_ship']==5){
                     $price=$find['cost'];
                 }
                 $cart_select[$k]['price'] = $price;
@@ -588,7 +588,6 @@ class OrderLogic extends BaseLogic
                 'staff_id' => $params['staff_id'] ?? 0,
                 'update_time' => time(),
             ], ['oid' => $order['id']]);
-            PayNotifyLogic::descStock($order['id']);
             $financeFlow = new StoreFinanceFlow();
             $financeFlowLogic = new StoreFinanceFlowLogic();
             $select_1 = $financeFlow->where(['order_id' => $order['id'], 'financial_pm' => 1, 'financial_type' => ['in' => 14, 15, 16]])->select();