From 40a92fbb496bcd29424daf41ae7d4dabadfd6e94 Mon Sep 17 00:00:00 2001
From: liu <1873441552@qq.com>
Date: Wed, 3 Jul 2024 09:31:03 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BD=99=E9=A2=9D=E5=92=8C=E9=87=87?=
 =?UTF-8?q?=E8=B4=AD=E6=AC=BE=E6=8E=A8=E9=80=81=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/logic/PayNotifyLogic.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php
index 889d6a2a..dec69583 100644
--- a/app/common/logic/PayNotifyLogic.php
+++ b/app/common/logic/PayNotifyLogic.php
@@ -114,9 +114,10 @@ class PayNotifyLogic extends BaseLogic
             ];
             OrderLogic::writeOff($params);
         }
+        PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'store_merchant', 'msg' => '您有一笔新的订单']);
         return  true;
         // Redis::send('push-platform-print', ['id' => $order['id']], 60);
-        // PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'store_merchant', 'msg' => '您有一笔新的订单']);
+
     }
 
     /**
@@ -241,7 +242,7 @@ class PayNotifyLogic extends BaseLogic
 
 
         // Redis::send('push-platform-print', ['id' => $order['id']], 60);
-        // PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'store_merchant', 'msg' => '您有一笔新的订单']);
+         PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'store_merchant', 'msg' => '您有一笔新的订单']);
     }
 
     //采购款支付后如果有对应的冻结的话就去反对应的log

From 15414c2a414b0bd1803e920bc060ed93e94076f3 Mon Sep 17 00:00:00 2001
From: liu <1873441552@qq.com>
Date: Wed, 3 Jul 2024 10:20:58 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=85=BC=E5=AE=B9=E6=94=B6=E9=93=B6?=
 =?UTF-8?q?=E5=8F=B0=E5=B1=95=E7=A4=BA=E6=94=B6=E6=AC=BE=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/common/logic/store_order/StoreOrderLogic.php b/app/common/logic/store_order/StoreOrderLogic.php
index 1ae87783..88adab80 100644
--- a/app/common/logic/store_order/StoreOrderLogic.php
+++ b/app/common/logic/store_order/StoreOrderLogic.php
@@ -239,6 +239,9 @@ class StoreOrderLogic extends BaseLogic
         $order['refund_status_name'] = OrderEnum::refundStatus($order['refund_status']) ?? '';
         $order['refund_type_name'] = OrderEnum::refundType($order['refund_type']) ?? '';
         $order['pay_type_name'] =PayEnum::getPaySceneDesc($order['pay_type']) ?? '';
+        if($order['pay_type'] == PayEnum::PURCHASE_FUNDS && in_array($order['shipping_type'],[1,2])){
+            $order['pay_type_name'] = "采购款";
+        }
         if ($order['pay_type'] == 19){
             $order['deduction_price'] = "0.00";
         }