gitee/course-tencent-cloud
1
0
Fork 0
mirror of https://gitee.com/koogua/course-tencent-cloud.git synced 2025-06-26 12:23:06 +08:00
Code Issues Releases Wiki Activity

Merge branch 'koogua/I399X5' into demo

Browse Source
This commit is contained in:
koogua 2021-03-03 19:26:40 +08:00
commit 75f32b0b12
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Admin/Views/setting/sms.volt
View File

@ -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>

4
app/Services/Logic/Notice/Sms/GoodsDeliver.php
View File

@ -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'],
];

4
app/Services/Logic/Notice/Sms/LiveBegin.php
View File

@ -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);

4
app/Services/Logic/Notice/WeChat/GoodsDeliver.php
View File

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