From d754080dad6765b7b593f7f3678495701b8bb990 Mon Sep 17 00:00:00 2001
From: evoxwht <442384644@qq.com>
Date: Sat, 23 Dec 2023 11:13:45 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=A8=8B=E5=BA=8F=E7=9B=AE=E5=BD=95?=
 =?UTF-8?q?=E3=80=91=E5=AE=A2=E6=9C=8D=E6=A8=A1=E7=89=88=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/app/api/controller/v1/order/StoreOrderController.php      | 2 +-
 crmeb/app/services/message/notice/WechatTemplateListService.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/crmeb/app/api/controller/v1/order/StoreOrderController.php b/crmeb/app/api/controller/v1/order/StoreOrderController.php
index 1a4fdd9c0..e3cc4de87 100644
--- a/crmeb/app/api/controller/v1/order/StoreOrderController.php
+++ b/crmeb/app/api/controller/v1/order/StoreOrderController.php
@@ -283,7 +283,7 @@ class StoreOrderController
                 }
             case PayServices::OFFLINE_PAY:
                 if ($this->services->setOrderTypePayOffline($order['order_id'])) {
-                    event('NoticeListener', [$order, 'admin_pay_success_code']);
+                    event('NoticeListener', [$order->toArray(), 'admin_pay_success_code']);
                     return app('json')->status('success', 410203);
                 } else {
                     return app('json')->status('success', 410216);
diff --git a/crmeb/app/services/message/notice/WechatTemplateListService.php b/crmeb/app/services/message/notice/WechatTemplateListService.php
index 50f0a2091..fbe62011c 100644
--- a/crmeb/app/services/message/notice/WechatTemplateListService.php
+++ b/crmeb/app/services/message/notice/WechatTemplateListService.php
@@ -216,7 +216,7 @@ class WechatTemplateListService extends NoticeService
         $adminList = $StoreServiceServices->getStoreServiceOrderNotice();
         foreach ($adminList as $item) {
             $this->sendTemplate((int)$item['uid'], [
-                'short_string6' => $status,
+                'short_thing6' => $status,
                 'character_string1' => $orderId,
                 'time2' => date('Y-m-d H:i:s', time()),
             ], $link);