From 2332ea4f29af7da397c6078d279edcb5dcfb99f9 Mon Sep 17 00:00:00 2001
From: liu <1873441552@qq.com>
Date: Fri, 21 Jun 2024 10:24:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=86=E5=88=86=E6=94=B6=E9=93=B6=E6=9C=BA?=
 =?UTF-8?q?=E5=92=8C=E5=B0=8F=E7=A8=8B=E5=BA=8F=E4=B8=8B=E5=8D=95=E6=89=A3?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/logic/order/OrderLogic.php  |  1 +
 app/common/logic/PayNotifyLogic.php | 20 +++++++++++++++-----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/app/api/logic/order/OrderLogic.php b/app/api/logic/order/OrderLogic.php
index 55140fd6c..2cc365e5b 100644
--- a/app/api/logic/order/OrderLogic.php
+++ b/app/api/logic/order/OrderLogic.php
@@ -440,6 +440,7 @@ class OrderLogic extends BaseLogic
             // }
             $order=StoreOrder::where('id',$data['id'])->find();
             PayNotifyLogic::afterPay($order);
+            PayNotifyLogic::descStock($order['id']);
             Db::commit();
             return true;
         } catch (\Exception $e) {
diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php
index 331948aaf..6fa47d13c 100644
--- a/app/common/logic/PayNotifyLogic.php
+++ b/app/common/logic/PayNotifyLogic.php
@@ -90,7 +90,9 @@ class PayNotifyLogic extends BaseLogic
         $capitalFlowDao = new CapitalFlowLogic($user);
         $capitalFlowDao->userExpense('user_order_balance_pay', 'order', $order['id'], $order['pay_price'],'',0,$order['store_id']);
         self::dealProductLog($order);
-        self::descStock($order['id']);
+        if($order['shipping_type'] == 3){
+            self::descStock($order['id']);
+        }
         // self::afterPay($order);
         // Redis::send('push-platform-print', ['id' => $order['id']], 60);
         // PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'store_merchant', 'msg' => '您有一笔新的订单']);
@@ -138,7 +140,9 @@ class PayNotifyLogic extends BaseLogic
             OrderLogic::writeOff($params);
         }
         self::dealProductLog($order);
-        self::descStock($order['id']);
+        if($order['shipping_type'] == 3){
+            self::descStock($order['id']);
+        }
 
         // self::afterPay($order);
         // Redis::send('push-platform-print', ['id' => $order['id']], 60);
@@ -178,7 +182,9 @@ class PayNotifyLogic extends BaseLogic
         }
 
         self::dealProductLog($order);
-        self::descStock($order['id']);
+        if($order['shipping_type'] == 3){
+            self::descStock($order['id']);
+        }
 
         // if ($order->pay_type == 9) {
         // $extra['create_time'] = $order['create_time'];
@@ -277,7 +283,9 @@ class PayNotifyLogic extends BaseLogic
         $cashFlowLogic = new CashFlowLogic();
         $cashFlowLogic->insert($order['store_id'], $order['pay_price']);
         self::dealProductLog($order);
-        self::descStock($order['id']);
+        if($order['shipping_type'] == 3){
+            self::descStock($order['id']);
+        }
         // Redis::send('push-platform-print', ['id' => $order['id']]);
     }
 
@@ -309,7 +317,9 @@ class PayNotifyLogic extends BaseLogic
             self::afterPay($order);
         }
         self::dealProductLog($order);
-        self::descStock($order['id']);
+        if($order['shipping_type'] == 3){
+            self::descStock($order['id']);
+        }
 
         // if ($order->pay_type == 9) {
         // $extra['create_time'] = $order['create_time'];