diff --git a/app/Console/Commands/PushCourses.php b/app/Console/Commands/PushCourses.php index a2c44c8..58c529a 100755 --- a/app/Console/Commands/PushCourses.php +++ b/app/Console/Commands/PushCourses.php @@ -46,7 +46,10 @@ class PushCourses extends Command $today = date('Y-m-d'); $courses = Course::whereHas('typeDetail', function ($query) { $query->where('is_push', 1); - })->get(); + }) + //->where('sign_end_date', $today) + ->where('is_push', 1) + ->get(); if ($courses->isEmpty()) { $this->info('没有可推送的课程'); return; @@ -55,13 +58,13 @@ class PushCourses extends Command foreach ($courses as $course) { // 所有报名审核成功的用户id $userIds = $course->courseSigns()->where('status', 1)->pluck('user_id'); - $users = User::whereIn('id', $userIds)->whereNotNull('company_id')->get(); + $users = User::whereIn('id', $userIds)->whereNotNull('company_id')->groupBy('company_id')->get(); foreach ($users as $user) { - $result = $YuanheRepository->pushCourses($course, $user); + $result = $YuanheRepository->pushCourses($course, $user,$out); if ($result) { $this->info("推送成功:{$course->name}-{$user->name}"); } else { - $this->info("推送失败:{$course->name}-{$user->name}"); + $this->info("推送失败:{$course->name}-{$user->name}-{$out}"); } } } diff --git a/app/Repositories/YuanheRepository.php b/app/Repositories/YuanheRepository.php index 8313255..ade2cb4 100755 --- a/app/Repositories/YuanheRepository.php +++ b/app/Repositories/YuanheRepository.php @@ -83,15 +83,15 @@ class YuanheRepository /** * 数据推送 */ - public function pushCourses(Course $course, User $user) + public function pushCourses(Course $course, User $user,&$out) { if (empty($user->company)) { return false; } $params = [ - 'classTeacher' => $course->teacher->name, + 'classTeacher' => $course->teacher->name??'', 'courseName' => $course->name, - 'description' => $user->company->businessScope, + 'description' => $user->company->businessScope??'', 'enterpriseName' => $user->company->company_name, 'creditCode' => $user->company->credit_code, 'groupId' => '1030004', @@ -106,9 +106,11 @@ class YuanheRepository if ($result['code'] == 200) { return true; } else { + $out = $result['msg']; return false; } } catch (\Exception $e) { + $out = $e->getMessage(); return false; } } diff --git a/database/migrations/2025_10_13_153610_alert_courses_table.php b/database/migrations/2025_10_13_153610_alert_courses_table.php new file mode 100644 index 0000000..5e93acd --- /dev/null +++ b/database/migrations/2025_10_13_153610_alert_courses_table.php @@ -0,0 +1,33 @@ +boolean('is_push')->default(true)->comment('是否推送0否1是'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('courses', function (Blueprint $table) { + // + }); + } +};