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 @@ - + 复制 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']), ];