diff --git a/app/Http/Home/Controllers/ImController.php b/app/Http/Home/Controllers/ImController.php
index 7461363e..133ba5fa 100644
--- a/app/Http/Home/Controllers/ImController.php
+++ b/app/Http/Home/Controllers/ImController.php
@@ -205,14 +205,14 @@ class ImController extends Controller
/**
* @Post("/msg/cs/send", name="home.im.send_cs_msg")
*/
- public function sendCsMessageAction()
+ public function sendCustomMessageAction()
{
$from = $this->request->getPost('from', 'string');
$to = $this->request->getPost('to', 'string');
$service = new ImService();
- $service->sendCsMessage($from, $to);
+ $service->sendCustomMessage($from, $to);
return $this->jsonSuccess();
}
diff --git a/app/Http/Home/Services/ImMessageTrait.php b/app/Http/Home/Services/ImMessageTrait.php
index 5a4842bb..07b33bd7 100644
--- a/app/Http/Home/Services/ImMessageTrait.php
+++ b/app/Http/Home/Services/ImMessageTrait.php
@@ -11,6 +11,7 @@ use App\Models\ImMessage as ImMessageModel;
use App\Repos\ImFriendUser as ImFriendUserRepo;
use App\Repos\ImMessage as ImMessageRepo;
use App\Repos\ImUser as ImUserRepo;
+use App\Services\DingTalk\Notice\CustomService as CustomServiceNotice;
use App\Validators\ImFriendUser as ImFriendUserValidator;
use App\Validators\ImGroup as ImGroupValidator;
use App\Validators\ImGroupUser as ImGroupUserValidator;
@@ -22,7 +23,7 @@ use GatewayClient\Gateway;
* layim中普通聊天和自定义聊天中接收方用户名使用的字段不一样，也够坑爹的
* 普通聊天username,自定义聊天name
*/
-Trait ImMessageTrait
+trait ImMessageTrait
{
public function getChatMessages()
@@ -166,9 +167,11 @@ Trait ImMessageTrait
}
$this->eventsManager->fire('ImMessage:afterCreate', $this, $imMessage);
+
+ return $imMessage;
}
- public function sendCsMessage($from, $to)
+ public function sendCustomMessage($from, $to)
{
$validator = new ImMessageValidator();
@@ -214,7 +217,11 @@ Trait ImMessageTrait
unset($to['name']);
- $this->sendChatMessage($from, $to);
+ $message = $this->sendChatMessage($from, $to);
+
+ $this->handleCustomServiceNotice($message);
+
+ return $message;
}
public function pullUnreadFriendMessages($id)
@@ -334,4 +341,11 @@ Trait ImMessageTrait
$group->update();
}
+ protected function handleCustomServiceNotice(ImMessageModel $message)
+ {
+ $notice = new CustomServiceNotice();
+
+ $notice->createTask($message);
+ }
+
}
\ No newline at end of file
diff --git a/app/Models/Task.php b/app/Models/Task.php
index ad9f6953..10501f83 100644
--- a/app/Models/Task.php
+++ b/app/Models/Task.php
@@ -13,12 +13,24 @@ class Task extends Model
const TYPE_POINT_GIFT_DELIVER = 3; // 积分礼品派发
const TYPE_LUCKY_GIFT_DELIVER = 4; // 抽奖礼品派发
+ /**
+ * 针对外部用户
+ */
const TYPE_NOTICE_ACCOUNT_LOGIN = 11; // 帐号登录通知
const TYPE_NOTICE_LIVE_BEGIN = 12; // 直播学员通知
const TYPE_NOTICE_ORDER_FINISH = 13; // 订单完成通知
const TYPE_NOTICE_REFUND_FINISH = 14; // 退款完成通知
const TYPE_NOTICE_CONSULT_REPLY = 15; // 咨询回复通知
- const TYPE_NOTICE_LIVE_TEACHER = 16; // 直播讲师通知
+
+ /**
+ * 针对内部人员
+ */
+ const TYPE_NOTICE_CONSULT_CREATE = 31; // 咨询创建通知
+ const TYPE_NOTICE_TEACHER_LIVE = 32; // 直播讲师通知
+ const TYPE_NOTICE_SERVER_MONITOR = 33; // 服务监控通知
+ const TYPE_NOTICE_CUSTOM_SERVICE = 34; // 客服消息通知
+ const TYPE_NOTICE_POINT_REDEEM = 35; // 积分兑换通知
+ const TYPE_NOTICE_LUCKY_REDEEM = 36; // 抽奖兑换通知
/**
* 优先级
@@ -84,6 +96,13 @@ class Task extends Model
*/
public $try_count = 0;
+ /**
+ * 最大重试次数
+ *
+ * @var int
+ */
+ public $max_try_count = 3;
+
/**
* 创建时间
*
diff --git a/app/Repos/ChapterLive.php b/app/Repos/ChapterLive.php
index 6319a384..74d83587 100644
--- a/app/Repos/ChapterLive.php
+++ b/app/Repos/ChapterLive.php
@@ -5,6 +5,7 @@ namespace App\Repos;
use App\Library\Paginator\Adapter\QueryBuilder as PagerQueryBuilder;
use App\Models\Chapter as ChapterModel;
use App\Models\ChapterLive as ChapterLiveModel;
+use Phalcon\Mvc\Model;
class ChapterLive extends Repository
{
@@ -54,4 +55,28 @@ class ChapterLive extends Repository
return $pager->paginate();
}
+ /**
+ * @param int $id
+ * @return ChapterLiveModel|Model|bool
+ */
+ public function findById($id)
+ {
+ return ChapterLiveModel::findFirst([
+ 'conditions' => 'id = :id:',
+ 'bind' => ['id' => $id],
+ ]);
+ }
+
+ /**
+ * @param int $chapterId
+ * @return ChapterLiveModel|Model|bool
+ */
+ public function findByChapterId($chapterId)
+ {
+ return ChapterLiveModel::findFirst([
+ 'conditions' => 'chapter_id = :chapter_id:',
+ 'bind' => ['chapter_id' => $chapterId],
+ ]);
+ }
+
}
diff --git a/app/Services/DingTalk/Notice/ConsultCreate.php b/app/Services/DingTalk/Notice/ConsultCreate.php
index d88d3b24..7bb9abf3 100644
--- a/app/Services/DingTalk/Notice/ConsultCreate.php
+++ b/app/Services/DingTalk/Notice/ConsultCreate.php
@@ -3,6 +3,8 @@
namespace App\Services\DingTalk\Notice;
use App\Models\Consult as ConsultModel;
+use App\Models\Task as TaskModel;
+use App\Repos\Consult as ConsultRepo;
use App\Repos\Course as CourseRepo;
use App\Repos\User as UserRepo;
use App\Services\DingTalkNotice;
@@ -10,8 +12,12 @@ use App\Services\DingTalkNotice;
class ConsultCreate extends DingTalkNotice
{
- public function handle(ConsultModel $consult)
+ public function handleTask(TaskModel $task)
{
+ $consultRepo = new ConsultRepo();
+
+ $consult = $consultRepo->findById($task->item_id);
+
$userRepo = new UserRepo();
$user = $userRepo->findById($consult->owner_id);
@@ -26,7 +32,34 @@ class ConsultCreate extends DingTalkNotice
'consult.question' => $consult->question,
]);
- $this->atCourseTeacher($course->id, $content);
+ return $this->atCourseTeacher($course->id, $content);
+ }
+
+ public function createTask(ConsultModel $consult)
+ {
+ $keyName = "dingtalk_consult_create_notice:{$consult->owner_id}";
+
+ $cache = $this->getCache();
+
+ $content = $cache->get($keyName);
+
+ if ($content) return;
+
+ $cache->save($keyName, 1, 3600);
+
+ $task = new TaskModel();
+
+ $itemInfo = [
+ 'consult' => ['id' => $consult->id],
+ ];
+
+ $task->item_id = $consult->id;
+ $task->item_info = $itemInfo;
+ $task->item_type = TaskModel::TYPE_NOTICE_CONSULT_CREATE;
+ $task->priority = TaskModel::PRIORITY_LOW;
+ $task->status = TaskModel::STATUS_PENDING;
+
+ $task->create();
}
}
\ No newline at end of file
diff --git a/app/Services/DingTalk/Notice/CustomService.php b/app/Services/DingTalk/Notice/CustomService.php
index 78b870ff..a57483cb 100644
--- a/app/Services/DingTalk/Notice/CustomService.php
+++ b/app/Services/DingTalk/Notice/CustomService.php
@@ -3,15 +3,35 @@
namespace App\Services\DingTalk\Notice;
use App\Models\ImMessage as ImMessageModel;
+use App\Models\Task as TaskModel;
+use App\Repos\ImMessage as ImMessageRepo;
use App\Repos\User as UserRepo;
use App\Services\DingTalkNotice;
class CustomService extends DingTalkNotice
{
- public function handle(ImMessageModel $message)
+ public function handleTask(TaskModel $task)
{
- $keyName = "dingtalk_cs_notice:{$message->sender_id}";
+ $messageRepo = new ImMessageRepo();
+
+ $message = $messageRepo->findById($task->item_id);
+
+ $userRepo = new UserRepo();
+
+ $sender = $userRepo->findById($message->sender_id);
+
+ $content = kg_ph_replace("{user.name} 通过在线客服给你发送了消息：{message.content}", [
+ 'user.name' => $sender->name,
+ 'message.content' => $message->content,
+ ]);
+
+ return $this->atCustomService($content);
+ }
+
+ public function createTask(ImMessageModel $message)
+ {
+ $keyName = "dingtalk_custom_service_notice:{$message->sender_id}";
$cache = $this->getCache();
@@ -21,16 +41,19 @@ class CustomService extends DingTalkNotice
$cache->save($keyName, 1, 3600);
- $userRepo = new UserRepo();
+ $task = new TaskModel();
- $sender = $userRepo->findById($message->sender_id);
+ $itemInfo = [
+ 'im_message' => ['id' => $message->id],
+ ];
- $content = kg_ph_replace("{user} 通过在线客服给你发送了消息：{message}", [
- 'user' => $sender->name,
- 'message' => $message->content,
- ]);
+ $task->item_id = $message->id;
+ $task->item_info = $itemInfo;
+ $task->item_type = TaskModel::TYPE_NOTICE_CUSTOM_SERVICE;
+ $task->priority = TaskModel::PRIORITY_MIDDLE;
+ $task->status = TaskModel::STATUS_PENDING;
- $this->atCustomService($content);
+ $task->create();
}
}
\ No newline at end of file
diff --git a/app/Services/DingTalk/Notice/LiveTeacher.php b/app/Services/DingTalk/Notice/LiveTeacher.php
index 1e4ce7f8..db20b0cb 100644
--- a/app/Services/DingTalk/Notice/LiveTeacher.php
+++ b/app/Services/DingTalk/Notice/LiveTeacher.php
@@ -3,14 +3,20 @@
namespace App\Services\DingTalk\Notice;
use App\Models\ChapterLive as ChapterLiveModel;
+use App\Models\Task as TaskModel;
+use App\Repos\ChapterLive as ChapterLiveRepo;
use App\Repos\Course as CourseRepo;
use App\Services\DingTalkNotice;
-class LiveTeacher extends DingTalkNotice
+class TeacherLive extends DingTalkNotice
{
- public function handle(ChapterLiveModel $live)
+ public function handleTask(TaskModel $task)
{
+ $liveRepo = new ChapterLiveRepo();
+
+ $live = $liveRepo->findById($task->item_id);
+
$courseRepo = new CourseRepo();
$course = $courseRepo->findById($live->course_id);
@@ -20,7 +26,24 @@ class LiveTeacher extends DingTalkNotice
'live.start_time' => date('Y-m-d H:i', $live->start_time),
]);
- $this->atCourseTeacher($course->id, $content);
+ return $this->atCourseTeacher($course->id, $content);
+ }
+
+ public function createTask(ChapterLiveModel $live)
+ {
+ $task = new TaskModel();
+
+ $itemInfo = [
+ 'live' => ['id' => $live->id],
+ ];
+
+ $task->item_id = $live->id;
+ $task->item_info = $itemInfo;
+ $task->item_type = TaskModel::TYPE_NOTICE_TEACHER_LIVE;
+ $task->priority = TaskModel::PRIORITY_LOW;
+ $task->status = TaskModel::STATUS_PENDING;
+
+ $task->create();
}
}
\ No newline at end of file
diff --git a/app/Services/DingTalk/Notice/OrderFinish.php b/app/Services/DingTalk/Notice/OrderFinish.php
deleted file mode 100644
index cc360b57..00000000
--- a/app/Services/DingTalk/Notice/OrderFinish.php
+++ /dev/null
@@ -1,27 +0,0 @@
-findById($order->owner_id);
-
- $text = kg_ph_replace("开单啦，{user.name} 同学完成了订单！\n订单名称：{order.subject}\n订单金额：￥{order.amount}", [
- 'user.name' => $user->name,
- 'order.subject' => $order->subject,
- 'order.amount' => $order->amount,
- ]);
-
- $this->send(['text' => $text]);
- }
-
-}
\ No newline at end of file
diff --git a/app/Services/DingTalk/Notice/PointRedeem.php b/app/Services/DingTalk/Notice/PointRedeem.php
new file mode 100644
index 00000000..791db8b1
--- /dev/null
+++ b/app/Services/DingTalk/Notice/PointRedeem.php
@@ -0,0 +1,47 @@
+findById($task->item_id);
+
+ $content = kg_ph_replace("{user.name} 兑换了商品 {gift.name}，不要忘记发货哦！", [
+ 'user.name' => $redeem->user_name,
+ 'gift.name' => $redeem->gift_name,
+ ]);
+
+ return $this->atCustomService($content);
+ }
+
+ public function createTask(PointRedeemModel $redeem)
+ {
+ if ($redeem->gift_type != PointGiftModel::TYPE_GOODS) return;
+
+ $task = new TaskModel();
+
+ $itemInfo = [
+ 'point_redeem' => ['id' => $redeem->id],
+ ];
+
+ $task->item_id = $redeem->id;
+ $task->item_info = $itemInfo;
+ $task->item_type = TaskModel::TYPE_NOTICE_POINT_REDEEM;
+ $task->priority = TaskModel::PRIORITY_MIDDLE;
+ $task->status = TaskModel::STATUS_PENDING;
+
+ $task->create();
+ }
+
+}
\ No newline at end of file
diff --git a/app/Services/DingTalk/Notice/ServerMonitor.php b/app/Services/DingTalk/Notice/ServerMonitor.php
new file mode 100644
index 00000000..3901bafc
--- /dev/null
+++ b/app/Services/DingTalk/Notice/ServerMonitor.php
@@ -0,0 +1,36 @@
+item_info['content'];
+
+ return $notice->atTechSupport($content);
+ }
+
+ public function createTask($content)
+ {
+ $task = new TaskModel();
+
+ $itemInfo = ['content' => $content];
+
+ $task->item_id = time();
+ $task->item_info = $itemInfo;
+ $task->item_type = TaskModel::TYPE_NOTICE_SERVER_MONITOR;
+ $task->priority = TaskModel::PRIORITY_HIGH;
+ $task->status = TaskModel::STATUS_PENDING;
+ $task->max_try_count = 1;
+
+ $task->create();
+ }
+
+}
\ No newline at end of file
diff --git a/app/Services/Logic/Consult/ConsultCreate.php b/app/Services/Logic/Consult/ConsultCreate.php
index 369fd19a..2ec411dd 100644
--- a/app/Services/Logic/Consult/ConsultCreate.php
+++ b/app/Services/Logic/Consult/ConsultCreate.php
@@ -6,6 +6,7 @@ use App\Models\Chapter as ChapterModel;
use App\Models\Consult as ConsultModel;
use App\Models\Course as CourseModel;
use App\Models\User as UserModel;
+use App\Services\DingTalk\Notice\ConsultCreate as ConsultCreateNotice;
use App\Services\Logic\ChapterTrait;
use App\Services\Logic\CourseTrait;
use App\Services\Logic\Service;
@@ -75,6 +76,8 @@ class ConsultCreate extends Service
$this->incrUserDailyConsultCount($user);
+ $this->handleConsultCreateNotice($consult);
+
return $consult;
}
@@ -111,6 +114,8 @@ class ConsultCreate extends Service
$this->incrUserDailyConsultCount($user);
+ $this->handleConsultCreateNotice($consult);
+
return $consult;
}
@@ -150,4 +155,11 @@ class ConsultCreate extends Service
$this->eventsManager->fire('UserDailyCounter:incrConsultCount', $this, $user);
}
+ protected function handleConsultCreateNotice(ConsultModel $consult)
+ {
+ $notice = new ConsultCreateNotice();
+
+ $notice->createTask($consult);
+ }
+
}
diff --git a/app/Services/Logic/Notice/AccountLogin.php b/app/Services/Logic/Notice/AccountLogin.php
index 6ae4b18f..9f4fdd06 100644
--- a/app/Services/Logic/Notice/AccountLogin.php
+++ b/app/Services/Logic/Notice/AccountLogin.php
@@ -54,6 +54,7 @@ class AccountLogin extends LogicService
$task->item_type = TaskModel::TYPE_NOTICE_ACCOUNT_LOGIN;
$task->priority = TaskModel::PRIORITY_LOW;
$task->status = TaskModel::STATUS_PENDING;
+ $task->max_try_count = 1;
$task->create();
}
diff --git a/app/Services/Logic/Notice/ConsultReply.php b/app/Services/Logic/Notice/ConsultReply.php
index 3b77f7c1..34cfaebc 100644
--- a/app/Services/Logic/Notice/ConsultReply.php
+++ b/app/Services/Logic/Notice/ConsultReply.php
@@ -86,6 +86,7 @@ class ConsultReply extends LogicService
$task->item_type = TaskModel::TYPE_NOTICE_CONSULT_REPLY;
$task->priority = TaskModel::PRIORITY_LOW;
$task->status = TaskModel::STATUS_PENDING;
+ $task->max_try_count = 1;
$task->create();
}
diff --git a/app/Services/Logic/Notice/LiveBegin.php b/app/Services/Logic/Notice/LiveBegin.php
index f125c56c..a0818d54 100644
--- a/app/Services/Logic/Notice/LiveBegin.php
+++ b/app/Services/Logic/Notice/LiveBegin.php
@@ -92,6 +92,7 @@ class LiveBegin extends LogicService
$task->item_type = TaskModel::TYPE_NOTICE_LIVE_BEGIN;
$task->priority = TaskModel::PRIORITY_LOW;
$task->status = TaskModel::STATUS_PENDING;
+ $task->max_try_count = 1;
$task->create();
}
diff --git a/db/migrations/20210215024511_data_202102151130.php b/db/migrations/20210215024511_data_202102151130.php
index f5fd6419..e2d0fde5 100644
--- a/db/migrations/20210215024511_data_202102151130.php
+++ b/db/migrations/20210215024511_data_202102151130.php
@@ -6,6 +6,11 @@ class Data202102151130 extends Phinx\Migration\AbstractMigration
public function up()
{
$rows = [
+ [
+ 'section' => 'dingtalk.robot',
+ 'item_key' => 'enabled',
+ 'item_value' => '0',
+ ],
[
'section' => 'dingtalk.robot',
'item_key' => 'app_secret',
diff --git a/db/migrations/20210215034511_schema_202102151230.php b/db/migrations/20210215034511_schema_202102151230.php
new file mode 100644
index 00000000..77b94e12
--- /dev/null
+++ b/db/migrations/20210215034511_schema_202102151230.php
@@ -0,0 +1,28 @@
+table('kg_task')
+ ->addColumn('max_try_count', 'integer', [
+ 'null' => false,
+ 'default' => '0',
+ 'limit' => MysqlAdapter::INT_REGULAR,
+ 'signed' => false,
+ 'comment' => '最大尝试数',
+ 'after' => 'try_count',
+ ])->save();
+ }
+
+ public function down()
+ {
+ $this->table('kg_task')
+ ->removeColumn('max_try_count')
+ ->save();
+ }
+
+}
diff --git a/public/static/home/js/im.cs.js b/public/static/home/js/im.cs.js
index 06c7727d..f86c831f 100644
--- a/public/static/home/js/im.cs.js
+++ b/public/static/home/js/im.cs.js
@@ -64,7 +64,7 @@ layui.use(['jquery', 'layim'], function () {
});
layim.on('sendMessage', function (res) {
- sendCsMessage(res);
+ sendCustomMessage(res);
});
showWelcomeMessage(csUser);
@@ -77,7 +77,7 @@ layui.use(['jquery', 'layim'], function () {
});
}
- function sendCsMessage(res) {
+ function sendCustomMessage(res) {
$.ajax({
type: 'POST',
url: '/im/msg/cs/send',
diff --git a/scheduler.php b/scheduler.php
index 000900f3..253ad168 100644
--- a/scheduler.php
+++ b/scheduler.php
@@ -16,21 +16,24 @@ $scheduler->php($script, $bin, ['--task' => 'deliver', '--action' => 'main'])
$scheduler->php($script, $bin, ['--task' => 'notice', '--action' => 'main'])
->at('*/3 * * * *');
-$scheduler->php($script, $bin, ['--task' => 'sync_learning', '--action' => 'main'])
- ->at('*/7 * * * *');
-
$scheduler->php($script, $bin, ['--task' => 'vod_event', '--action' => 'main'])
->at('*/5 * * * *');
-$scheduler->php($script, $bin, ['--task' => 'close_trade', '--action' => 'main'])
- ->at('*/13 * * * *');
+$scheduler->php($script, $bin, ['--task' => 'sync_learning', '--action' => 'main'])
+ ->at('*/7 * * * *');
-$scheduler->php($script, $bin, ['--task' => 'monitor', '--action' => 'main'])
- ->at('*/12 * * * *');
+$scheduler->php($script, $bin, ['--task' => 'teacher_live_notice', '--action' => 'consume'])
+ ->at('*/10 * * * *');
$scheduler->php($script, $bin, ['--task' => 'point_gift_deliver', '--action' => 'main'])
->at('*/11 * * * *');
+$scheduler->php($script, $bin, ['--task' => 'server_monitor', '--action' => 'main'])
+ ->at('*/12 * * * *');
+
+$scheduler->php($script, $bin, ['--task' => 'close_trade', '--action' => 'main'])
+ ->at('*/13 * * * *');
+
$scheduler->php($script, $bin, ['--task' => 'close_order', '--action' => 'main'])
->hourly(3);
@@ -61,4 +64,10 @@ $scheduler->php($script, $bin, ['--task' => 'revoke_vip', '--action' => 'main'])
$scheduler->php($script, $bin, ['--task' => 'sitemap', '--action' => 'main'])
->daily(4, 3);
+$scheduler->php($script, $bin, ['--task' => 'teacher_live_notice', '--action' => 'provide'])
+ ->daily(4, 7);
+
+$scheduler->php($script, $bin, ['--task' => 'optimize_table', '--action' => 'main'])
+ ->weekly(6, 5, 3);
+
$scheduler->run();
\ No newline at end of file