From 56f66c01bdd6ad495c9f9f70cefc9254b3cc9656 Mon Sep 17 00:00:00 2001
From: xiaochong0302 <xiaochong0302@gmail.com>
Date: Thu, 16 May 2024 11:29:19 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=BE=AE=E4=BF=A1=E5=85=AC?=
 =?UTF-8?q?=E4=BC=97=E5=8F=B7=E6=A8=A1=E6=9D=BF=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Admin/Views/setting/wechat_oa_notice.volt        | 2 ++
 .../Logic/Notice/External/WeChat/AccountLogin.php         | 8 ++++----
 .../Logic/Notice/External/WeChat/GoodsDeliver.php         | 6 +++---
 app/Services/Logic/Notice/External/WeChat/OrderFinish.php | 6 +++---
 .../Logic/Notice/External/WeChat/RefundFinish.php         | 8 ++++----
 5 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/app/Http/Admin/Views/setting/wechat_oa_notice.volt b/app/Http/Admin/Views/setting/wechat_oa_notice.volt
index 7b86a162..37cccc21 100644
--- a/app/Http/Admin/Views/setting/wechat_oa_notice.volt
+++ b/app/Http/Admin/Views/setting/wechat_oa_notice.volt
@@ -47,6 +47,7 @@
             </td>
             <td><input class="layui-input" type="text" name="notice_template[refund_finish][id]" value="{{ notice_template.refund_finish.id }}" lay-verify="required"></td>
         </tr>
+        <!--
         <tr>
             <td>课程直播提醒</td>
             <td>
@@ -63,6 +64,7 @@
             </td>
             <td><input class="layui-input" type="text" name="notice_template[consult_reply][id]" value="{{ notice_template.consult_reply.id }}" lay-verify="required"></td>
         </tr>
+        -->
         </tbody>
     </table>
     <br>
diff --git a/app/Services/Logic/Notice/External/WeChat/AccountLogin.php b/app/Services/Logic/Notice/External/WeChat/AccountLogin.php
index 36208a08..6319492f 100644
--- a/app/Services/Logic/Notice/External/WeChat/AccountLogin.php
+++ b/app/Services/Logic/Notice/External/WeChat/AccountLogin.php
@@ -43,10 +43,10 @@ class AccountLogin extends WeChatNotice
         $params = [
             'first' => $first,
             'remark' => $remark,
-            'keyword1' => $loginUser,
-            'keyword2' => $loginTime,
-            'keyword3' => $loginRegion,
-            'keyword4' => $loginIp,
+            'thing3' => $loginUser,
+            'time2' => $loginTime,
+            'thing7' => $loginRegion,
+            'character_string8' => $loginIp,
         ];
 
         $templateId = $this->getTemplateId($this->templateCode);
diff --git a/app/Services/Logic/Notice/External/WeChat/GoodsDeliver.php b/app/Services/Logic/Notice/External/WeChat/GoodsDeliver.php
index 70304e3b..6d336c33 100644
--- a/app/Services/Logic/Notice/External/WeChat/GoodsDeliver.php
+++ b/app/Services/Logic/Notice/External/WeChat/GoodsDeliver.php
@@ -33,9 +33,9 @@ class GoodsDeliver extends WeChatNotice
         $params = [
             'first' => $first,
             'remark' => $remark,
-            'keyword1' => $params['order_sn'],
-            'keyword2' => $params['goods_name'],
-            'keyword3' => date('Y-m-d H:i', $params['deliver_time']),
+            'character_string12' => $params['order_sn'],
+            'thing14' => $params['goods_name'],
+            'time3' => date('Y-m-d H:i', $params['deliver_time']),
         ];
 
         $templateId = $this->getTemplateId($this->templateCode);
diff --git a/app/Services/Logic/Notice/External/WeChat/OrderFinish.php b/app/Services/Logic/Notice/External/WeChat/OrderFinish.php
index b242b881..2594bcd2 100644
--- a/app/Services/Logic/Notice/External/WeChat/OrderFinish.php
+++ b/app/Services/Logic/Notice/External/WeChat/OrderFinish.php
@@ -33,9 +33,9 @@ class OrderFinish extends WeChatNotice
         $params = [
             'first' => $first,
             'remark' => $remark,
-            'keyword1' => sprintf('%s元', $params['order']['amount']),
-            'keyword2' => $params['order']['subject'],
-            'keyword3' => date('Y-m-d H:i', $params['order']['update_time']),
+            'amount3' => sprintf('%s元', $params['order']['amount']),
+            'thing1' => $params['order']['subject'],
+            'time4' => date('Y-m-d H:i', $params['order']['update_time']),
         ];
 
         $templateId = $this->getTemplateId($this->templateCode);
diff --git a/app/Services/Logic/Notice/External/WeChat/RefundFinish.php b/app/Services/Logic/Notice/External/WeChat/RefundFinish.php
index da710593..f19d3c0c 100644
--- a/app/Services/Logic/Notice/External/WeChat/RefundFinish.php
+++ b/app/Services/Logic/Notice/External/WeChat/RefundFinish.php
@@ -33,10 +33,10 @@ class RefundFinish extends WeChatNotice
         $params = [
             'first' => $first,
             'remark' => $remark,
-            'keyword1' => $params['refund']['sn'],
-            'keyword2' => $params['refund']['subject'],
-            'keyword3' => sprintf('%s元', $params['refund']['amount']),
-            'keyword4' => date('Y-m-d H:i', $params['refund']['update_time']),
+            'character_string5' => $params['refund']['sn'],
+            'thing1' => $params['refund']['subject'],
+            'amount2' => sprintf('%s元', $params['refund']['amount']),
+            'time4' => date('Y-m-d H:i', $params['refund']['update_time']),
         ];
 
         $templateId = $this->getTemplateId($this->templateCode);