From 4ce06d9a234f9b8a85a526b806551cccbaa44425 Mon Sep 17 00:00:00 2001
From: koogua <xiaochong0302@gmail.com>
Date: Wed, 3 Mar 2021 19:24:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=95=86=E5=93=81=E5=8F=91?=
 =?UTF-8?q?=E8=B4=A7=E9=80=9A=E7=9F=A5=E5=8F=82=E6=95=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Admin/Views/setting/sms.volt             | 2 +-
 app/Services/Logic/Notice/Sms/GoodsDeliver.php    | 4 +++-
 app/Services/Logic/Notice/Sms/LiveBegin.php       | 4 +++-
 app/Services/Logic/Notice/WeChat/GoodsDeliver.php | 4 ++--
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/Http/Admin/Views/setting/sms.volt b/app/Http/Admin/Views/setting/sms.volt
index 046b4a0c..547d9626 100644
--- a/app/Http/Admin/Views/setting/sms.volt
+++ b/app/Http/Admin/Views/setting/sms.volt
@@ -74,7 +74,7 @@
                     <input type="radio" name="template[goods_deliver][enabled]" value="0" title="否" {% if template.goods_deliver.enabled == "0" %}checked="checked"{% endif %}>
                 </td>
                 <td><input class="layui-input" type="text" name="template[goods_deliver][id]" value="{{ template.goods_deliver.id }}" lay-verify="required"></td>
-                <td><input id="tc-order-finish" class="layui-input" type="text" value="发货成功，商品名称：{1}，订单序号：{2}，请注意查收。" readonly="readonly"></td>
+                <td><input id="tc-goods-deliver" class="layui-input" type="text" value="发货成功，商品名称：{1}，订单序号：{2}，发货时间：{3}，请注意查收。" readonly="readonly"></td>
                 <td><span class="kg-copy layui-btn" data-clipboard-target="#tc-goods-deliver">复制</span></td>
             </tr>
             <tr>
diff --git a/app/Services/Logic/Notice/Sms/GoodsDeliver.php b/app/Services/Logic/Notice/Sms/GoodsDeliver.php
index b36762ba..d25524d1 100644
--- a/app/Services/Logic/Notice/Sms/GoodsDeliver.php
+++ b/app/Services/Logic/Notice/Sms/GoodsDeliver.php
@@ -18,6 +18,8 @@ class GoodsDeliver extends Smser
      */
     public function handle(UserModel $user, array $params)
     {
+        $params['deliver_time'] = date('Y-m-d H:i', $params['deliver_time']);
+
         $accountRepo = new AccountRepo();
 
         $account = $accountRepo->findById($user->id);
@@ -27,8 +29,8 @@ class GoodsDeliver extends Smser
         $templateId = $this->getTemplateId($this->templateCode);
 
         $params = [
-            $params['order_sn'],
             $params['goods_name'],
+            $params['order_sn'],
             $params['deliver_time'],
         ];
 
diff --git a/app/Services/Logic/Notice/Sms/LiveBegin.php b/app/Services/Logic/Notice/Sms/LiveBegin.php
index 6fd3e66a..cbe85440 100644
--- a/app/Services/Logic/Notice/Sms/LiveBegin.php
+++ b/app/Services/Logic/Notice/Sms/LiveBegin.php
@@ -18,6 +18,8 @@ class LiveBegin extends Smser
      */
     public function handle(UserModel $user, array $params)
     {
+        $params['live']['start_time'] = date('H:i', $params['live']['start_time']);
+
         $accountRepo = new AccountRepo();
 
         $account = $accountRepo->findById($user->id);
@@ -27,7 +29,7 @@ class LiveBegin extends Smser
         $params = [
             $params['course']['title'],
             $params['chapter']['title'],
-            date('H:i', $params['live']['start_time']),
+            $params['live']['start_time'],
         ];
 
         $templateId = $this->getTemplateId($this->templateCode);
diff --git a/app/Services/Logic/Notice/WeChat/GoodsDeliver.php b/app/Services/Logic/Notice/WeChat/GoodsDeliver.php
index 7519dc0d..cce24b98 100644
--- a/app/Services/Logic/Notice/WeChat/GoodsDeliver.php
+++ b/app/Services/Logic/Notice/WeChat/GoodsDeliver.php
@@ -24,8 +24,8 @@ class GoodsDeliver extends WeChatNotice
         $params = [
             'first' => $first,
             'remark' => $remark,
-            'keyword1' => $params['goods_name'],
-            'keyword2' => $params['order_sn'],
+            'keyword1' => $params['order_sn'],
+            'keyword2' => $params['goods_name'],
             'keyword3' => date('Y-m-d H:i', $params['deliver_time']),
         ];