master
cody 2 weeks ago
parent b90512578a
commit 423d3c3a71

@ -46,7 +46,10 @@ class PushCourses extends Command
$today = date('Y-m-d'); $today = date('Y-m-d');
$courses = Course::whereHas('typeDetail', function ($query) { $courses = Course::whereHas('typeDetail', function ($query) {
$query->where('is_push', 1); $query->where('is_push', 1);
})->get(); })
//->where('sign_end_date', $today)
->where('is_push', 1)
->get();
if ($courses->isEmpty()) { if ($courses->isEmpty()) {
$this->info('没有可推送的课程'); $this->info('没有可推送的课程');
return; return;
@ -55,13 +58,13 @@ class PushCourses extends Command
foreach ($courses as $course) { foreach ($courses as $course) {
// 所有报名审核成功的用户id // 所有报名审核成功的用户id
$userIds = $course->courseSigns()->where('status', 1)->pluck('user_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) { foreach ($users as $user) {
$result = $YuanheRepository->pushCourses($course, $user); $result = $YuanheRepository->pushCourses($course, $user,$out);
if ($result) { if ($result) {
$this->info("推送成功:{$course->name}-{$user->name}"); $this->info("推送成功:{$course->name}-{$user->name}");
} else { } else {
$this->info("推送失败:{$course->name}-{$user->name}"); $this->info("推送失败:{$course->name}-{$user->name}-{$out}");
} }
} }
} }

@ -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)) { if (empty($user->company)) {
return false; return false;
} }
$params = [ $params = [
'classTeacher' => $course->teacher->name, 'classTeacher' => $course->teacher->name??'',
'courseName' => $course->name, 'courseName' => $course->name,
'description' => $user->company->businessScope, 'description' => $user->company->businessScope??'',
'enterpriseName' => $user->company->company_name, 'enterpriseName' => $user->company->company_name,
'creditCode' => $user->company->credit_code, 'creditCode' => $user->company->credit_code,
'groupId' => '1030004', 'groupId' => '1030004',
@ -106,9 +106,11 @@ class YuanheRepository
if ($result['code'] == 200) { if ($result['code'] == 200) {
return true; return true;
} else { } else {
$out = $result['msg'];
return false; return false;
} }
} catch (\Exception $e) { } catch (\Exception $e) {
$out = $e->getMessage();
return false; return false;
} }
} }

@ -0,0 +1,33 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::table('courses', function (Blueprint $table) {
// 是否推送
$table->boolean('is_push')->default(true)->comment('是否推送0否1是');
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::table('courses', function (Blueprint $table) {
//
});
}
};
Loading…
Cancel
Save