From 6cbc8578321899c358a6c4a42075bd57a108c357 Mon Sep 17 00:00:00 2001 From: cody <648753004@qq.com> Date: Fri, 19 Sep 2025 14:27:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/VisitAuditController.php | 60 ++++++++++--------- app/Models/VisitAudit.php | 33 ---------- app/Notifications/AuditResultEmailNotify.php | 6 +- 3 files changed, 35 insertions(+), 64 deletions(-) diff --git a/app/Http/Controllers/Admin/VisitAuditController.php b/app/Http/Controllers/Admin/VisitAuditController.php index 8217397..2676d77 100644 --- a/app/Http/Controllers/Admin/VisitAuditController.php +++ b/app/Http/Controllers/Admin/VisitAuditController.php @@ -9,6 +9,7 @@ use App\Models\Visit; use App\Models\VisitAudit; use App\Models\VisitLog; use App\Models\VisitTime; +use App\Notifications\AuditResultEmailNotify; use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Validator; @@ -140,9 +141,9 @@ class VisitAuditController extends CommonController $model->save(); // 获取必要数据 $visit = Visit::find($all['visit_id']); - // 短信通知下一个审核人，如果当前通过的话 + // 邮件通知下一个审核人，如果当前通过的话 if ($all['status'] == 1) { - VisitAudit::smsNextAudit($visit, $model->level); + VisitAudit::emailNextAudit($visit, $model->level); } $user = User::find($visit->user_id); $visitTime = VisitTime::find($visit->visit_time_id); @@ -162,33 +163,38 @@ class VisitAuditController extends CommonController // 通过 $auditResult = '通过'; Visit::where('id', $all['visit_id'])->update(['audit_status' => 1]); - // 发短信 -// if (!empty($acceptAdmin->mobile)) { -// $vars = ['date' => $visit->date, 'name' => $visit->name, 'phone_number' => $visit->mobile]; -// $template_id = '5wReg1'; -// sms($acceptAdmin->mobile, $vars, $template_id); -// } + // 发邮件通知接待人审核通过 + if (!empty($acceptAdmin->email)) { + $visitData = [ + 'date' => $visit->date, + 'name' => $visit->name, + 'visitor_name' => $visit->name, + 'accept_admin_name' => $acceptAdmin->name, + 'company_name' => $visit->company_name ?? '' + ]; + $acceptAdmin->notify(new AuditResultEmailNotify($visitData, '通过')); + } } if ($auditResult) { -// // 发通知订阅消息 -// $templateData = [ -// 'date1' => [ -// 'value' => $visit->date -// ], -// 'name3' => [ -// 'value' => $acceptAdmin->name, -// ], -// 'thing4' => [ -// 'value' => $visit->name -// ], -// 'thing13' => [ -// 'value' => $auditResult, -// ], -// 'thing9' => [ -// 'value' => $visit->company_name -// ], -// ]; -// Visit::subMsg('IczaKkCmwf55tAAzCcxb_fbbf5L25SWrSKvaBrkIyk4', $user->openid, $templateData, $all['visit_id']); + // 发通知订阅消息 + $templateData = [ + 'date1' => [ + 'value' => $visit->date + ], + 'name3' => [ + 'value' => $acceptAdmin->name, + ], + 'thing4' => [ + 'value' => $visit->name + ], + 'thing13' => [ + 'value' => $auditResult, + ], + 'thing9' => [ + 'value' => $visit->company_name + ], + ]; + Visit::subMsg('r8n41lmkGeob15YBuuxhG7MbpgVSsUxKnK9ORPtr5VY', $user->openid, $templateData, $all['visit_id']); } } // 审核记录 diff --git a/app/Models/VisitAudit.php b/app/Models/VisitAudit.php index 81ca4f9..b00e1a7 100644 --- a/app/Models/VisitAudit.php +++ b/app/Models/VisitAudit.php @@ -18,39 +18,6 @@ class VisitAudit extends SoftDeletesModel return $this->hasOne(Admin::class, 'id', 'audit_admin_id'); } - /** - * 短信通知下一个审核人 - */ - public static function smsNextAudit($visit, $nowVisitAuditLevel = -1) - { - // 通知下一个审核人 - $mobile = Admin::where(function ($query) use ($visit, $nowVisitAuditLevel) { - if ($nowVisitAuditLevel == -1) { - // 通知第一个审核人 - $adminId = VisitAudit::where('visit_id', $visit->id)->orderBy('level', 'asc')->value('audit_admin_id'); - } else { - $adminId = VisitAudit::where('visit_id', $visit->id) - ->where('level', '>', $nowVisitAuditLevel) - ->orderBy('level', 'asc') - ->value('audit_admin_id'); - } - $query->where('id', $adminId); - })->value('mobile'); - if (empty($mobile)) { - return false; - } - $vars = ['date' => $visit->date, 'name' => $visit->name, 'phone_number' => $visit->mobile]; - if ($nowVisitAuditLevel == -1) { - $template_id = 'uAQaB4'; - } else { - $uname = Admin::where('id', $visit->accept_admin_id)->value('name'); - $vars = ['date' => $visit->date, 'name' => $visit->name, 'phone_number' => $visit->mobile, 'uname' => $uname]; - $template_id = 'QXPs33'; - } - //sms($mobile, $vars, $template_id); - return true; - } - /** * 邮件通知下一个审核人 */ diff --git a/app/Notifications/AuditResultEmailNotify.php b/app/Notifications/AuditResultEmailNotify.php index afb9e00..5f05f0d 100644 --- a/app/Notifications/AuditResultEmailNotify.php +++ b/app/Notifications/AuditResultEmailNotify.php @@ -56,8 +56,7 @@ class AuditResultEmailNotify extends Notification ->line('您的拜访申请已审核通过，预约于 ' . $visitData['date'] . ' 到访。') ->line('被访人：' . $visitData['accept_admin_name']) ->line('公司名称：' . $visitData['company_name']) - ->line('请按时到访，如有疑问请联系被访人。') - ->action('查看详情', url('/mobile/visits')); + ->line('请按时到访，如有疑问请联系被访人。'); } else { // 审核驳回的邮件 return (new MailMessage) @@ -67,8 +66,7 @@ class AuditResultEmailNotify extends Notification ->line('预约日期：' . $visitData['date']) ->line('被访人：' . $visitData['accept_admin_name']) ->line('公司名称：' . $visitData['company_name']) - ->line('如有疑问，请联系被访人或重新提交申请。') - ->action('重新申请', url('/mobile/visits')); + ->line('如有疑问，请联系被访人或重新提交申请。'); } } }