Просмотр исходного кода

add - 师傅注册微信通知指定用户

liugc 1 год назад
Родитель
Сommit
02a47358a9

+ 3 - 3
app/adminapi/logic/notice/NoticeLogic.php

@@ -67,7 +67,7 @@ class NoticeLogic extends BaseLogic
                 'status' => 0,
             ];
         }
-        $noticeSetting['oa_notice']['tips'] = NoticeEnum::getOperationTips(NoticeEnum::MNP, $noticeSetting['scene_id']);
+        $noticeSetting['oa_notice']['tips'] = NoticeEnum::getOperationTips(NoticeEnum::OA, $noticeSetting['scene_id']);
         if (empty($noticeSetting['mnp_notice'])) {
             $noticeSetting['mnp_notice'] = [
                 'template_id' => '',
@@ -99,11 +99,11 @@ class NoticeLogic extends BaseLogic
     {
         try {
             // 校验参数
-            self::checkSet($params);
+            //self::checkSet($params);
             // 拼装更新数据
             $updateData = [];
             foreach ($params['template'] as $item) {
-                $updateData[$item['type'] . '_notice'] = json_encode($item, JSON_UNESCAPED_UNICODE);
+                $item['type']??0 && $updateData[$item['type'] . '_notice'] = json_encode($item, JSON_UNESCAPED_UNICODE);
             }
             // 更新通知设置
             NoticeSetting::where('id', $params['id'])->update($updateData);

+ 2 - 1
app/common/enum/notice/NoticeEnum.php

@@ -39,7 +39,7 @@ class NoticeEnum
     const OTHER_CAPTCHA = 105;
     const GCSSJHM_CAPTCHA =106;
     const ACCOUNT_PASSWORD =107;
-
+    const WORKER_EXAMINE =108;
 
     /**
      * 验证码场景
@@ -52,6 +52,7 @@ class NoticeEnum
         self::OTHER_CAPTCHA,
         self::GCSSJHM_CAPTCHA,
         self::ACCOUNT_PASSWORD,
+        self::WORKER_EXAMINE,
     ];
 
 

+ 0 - 1
app/common/service/wechat/WeChatOaService.php

@@ -209,7 +209,6 @@ class WeChatOaService
             // 替换通知模板参数
             $content = $this->contentFormat($noticeSetting, $params);
             // 添加通知记录
-            $params['user_id'] = $params['worker_id'];
             $this->notice = NoticeLogic::addNotice($params, $noticeSetting, NoticeEnum::OA, $content);
             // 发送
             $result = $this->app->getClient()->postJson('cgi-bin/message/template/send', [

+ 13 - 0
app/workerapi/controller/LoginController.php

@@ -14,7 +14,9 @@
 
 namespace app\workerapi\controller;
 
+use app\common\enum\notice\NoticeEnum;
 use app\common\model\master_worker\MasterWorker;
+use app\common\model\notice\NoticeSetting;
 use app\workerapi\logic\LoginLogic;
 use app\workerapi\validate\LoginAccountValidate;
 use app\workerapi\validate\RegisterValidate;
@@ -46,6 +48,17 @@ class LoginController extends BaseApiController
         }
         $result = LoginLogic::register($params);
         if (true === $result) {
+            // 发送通知给平台配置的审核人
+            $noticeSetting = NoticeSetting::where('scene_id', NoticeEnum::WORKER_EXAMINE)->findOrEmpty()->toArray();
+            if($noticeSetting['oa_notice']['designated_user']??0 && $noticeSetting['oa_notice']['designated_user']){
+                event('Notice',  [
+                    'scene_id' => NoticeEnum::WORKER_EXAMINE,
+                    'params' => [
+                        'user_id' => 0,
+                        'openid' => $noticeSetting['oa_notice']['designated_user'],
+                    ]
+                ]);
+            }
             return $this->success('注册成功', [], 1, 1);
         }
         return $this->fail(LoginLogic::getError());