From 649029218298907e8756bfc25e9bab267287c535 Mon Sep 17 00:00:00 2001 From: lemon <15040771@qq.com> Date: Mon, 13 Sep 2021 21:52:44 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Console/Kernel.php | 2 +- app/Jobs/BalanceDue.php | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index 09ca566..d0ffac1 100644 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -27,7 +27,7 @@ class Kernel extends ConsoleKernel protected function schedule(Schedule $schedule) { $schedule->command('demand:timeout')->everyMinute(); - $schedule->command('balance:due')->dailyAt('21:35');; + $schedule->command('balance:due')->everyTenMinutes(); // $schedule->command('inspire')->hourly(); } diff --git a/app/Jobs/BalanceDue.php b/app/Jobs/BalanceDue.php index c644318..086ffb8 100644 --- a/app/Jobs/BalanceDue.php +++ b/app/Jobs/BalanceDue.php @@ -38,6 +38,7 @@ class BalanceDue implements ShouldQueue */ public function handle() { + Log::info(now()); $order = Order::query()->where('order_no',$this->orderNumber)->first(); if(env('SMS_SWITCH' , '') == true && !empty($order->status) && ($order->status == OrderStatus::PAID || $order->status == OrderStatus::PAID_RETAINAGE)){ Log::info('队列执行'); From 002fff4a5acbbeb1e9db52a3843e1f71a3af86bf Mon Sep 17 00:00:00 2001 From: lemon <15040771@qq.com> Date: Mon, 13 Sep 2021 22:43:23 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Console/Commands/BalanceDue.php | 1 + app/Jobs/BalanceDue.php | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Console/Commands/BalanceDue.php b/app/Console/Commands/BalanceDue.php index 56c54d0..921e52f 100644 --- a/app/Console/Commands/BalanceDue.php +++ b/app/Console/Commands/BalanceDue.php @@ -43,6 +43,7 @@ class BalanceDue extends Command */ public function handle() { + Log::info(now()); if (env('SMS_SWITCH' , '') == true) { $orders = Order::query() ->where('status', OrderStatus::PAY_EARNEST) diff --git a/app/Jobs/BalanceDue.php b/app/Jobs/BalanceDue.php index 086ffb8..c644318 100644 --- a/app/Jobs/BalanceDue.php +++ b/app/Jobs/BalanceDue.php @@ -38,7 +38,6 @@ class BalanceDue implements ShouldQueue */ public function handle() { - Log::info(now()); $order = Order::query()->where('order_no',$this->orderNumber)->first(); if(env('SMS_SWITCH' , '') == true && !empty($order->status) && ($order->status == OrderStatus::PAID || $order->status == OrderStatus::PAID_RETAINAGE)){ Log::info('队列执行'); From 62b61a6287816f767561357e096ed3c736de6883 Mon Sep 17 00:00:00 2001 From: lemon <15040771@qq.com> Date: Mon, 13 Sep 2021 22:43:54 +0800 Subject: [PATCH 03/10] rizhi --- app/Console/Kernel.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index d0ffac1..81ef277 100644 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -27,7 +27,7 @@ class Kernel extends ConsoleKernel protected function schedule(Schedule $schedule) { $schedule->command('demand:timeout')->everyMinute(); - $schedule->command('balance:due')->everyTenMinutes(); + $schedule->command('balance:due')->everyMinute(); // $schedule->command('inspire')->hourly(); } From c4d6c311f34104c2d245579246648ff35a2b73ff Mon Sep 17 00:00:00 2001 From: lemon <15040771@qq.com> Date: Mon, 13 Sep 2021 23:18:32 +0800 Subject: [PATCH 04/10] 1 --- app/Console/Commands/DemandTimeout.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Console/Commands/DemandTimeout.php b/app/Console/Commands/DemandTimeout.php index e0b00b3..3a575eb 100644 --- a/app/Console/Commands/DemandTimeout.php +++ b/app/Console/Commands/DemandTimeout.php @@ -40,6 +40,7 @@ class DemandTimeout extends Command */ public function handle() { + Log::info(now().'竞标'); //Log::info('定时任务'); Demand::query() ->where('deadline','<=' ,now()) From 1415c7233cafcae30b9de2fa3f5b414fe33da22c Mon Sep 17 00:00:00 2001 From: lemon <15040771@qq.com> Date: Mon, 13 Sep 2021 23:50:42 +0800 Subject: [PATCH 05/10] 11 --- app/Console/Commands/BalanceDue.php | 2 +- app/Console/Commands/DemandTimeout.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Console/Commands/BalanceDue.php b/app/Console/Commands/BalanceDue.php index 921e52f..e888806 100644 --- a/app/Console/Commands/BalanceDue.php +++ b/app/Console/Commands/BalanceDue.php @@ -43,7 +43,7 @@ class BalanceDue extends Command */ public function handle() { - Log::info(now()); + Log::info(111); if (env('SMS_SWITCH' , '') == true) { $orders = Order::query() ->where('status', OrderStatus::PAY_EARNEST) diff --git a/app/Console/Commands/DemandTimeout.php b/app/Console/Commands/DemandTimeout.php index 3a575eb..74d525d 100644 --- a/app/Console/Commands/DemandTimeout.php +++ b/app/Console/Commands/DemandTimeout.php @@ -40,7 +40,7 @@ class DemandTimeout extends Command */ public function handle() { - Log::info(now().'竞标'); + Log::info(222); //Log::info('定时任务'); Demand::query() ->where('deadline','<=' ,now()) From da59b8963c37b9f2526f9f7152c913b99a06363a Mon Sep 17 00:00:00 2001 From: lemon <15040771@qq.com> Date: Mon, 13 Sep 2021 23:53:12 +0800 Subject: [PATCH 06/10] 1 --- app/Console/Commands/BalanceDue.php | 46 ++++++++++++++--------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/app/Console/Commands/BalanceDue.php b/app/Console/Commands/BalanceDue.php index e888806..ea03d66 100644 --- a/app/Console/Commands/BalanceDue.php +++ b/app/Console/Commands/BalanceDue.php @@ -44,28 +44,28 @@ class BalanceDue extends Command public function handle() { Log::info(111); - if (env('SMS_SWITCH' , '') == true) { - $orders = Order::query() - ->where('status', OrderStatus::PAY_EARNEST) - ->get(); - $sms = new SmsService(); - foreach ($orders as $order) { - if (!empty($order->mobile)) { - $sms->send( - 'pay', - [ - $order->order_no, - '定金/订金', - $order->timeout, - '定金/订金', - '小程序' - ], - [ - $order->mobile - ], - ); - } - } - } + //if (env('SMS_SWITCH' , '') == true) { + // $orders = Order::query() + // ->where('status', OrderStatus::PAY_EARNEST) + // ->get(); + // $sms = new SmsService(); + // foreach ($orders as $order) { + // if (!empty($order->mobile)) { + // $sms->send( + // 'pay', + // [ + // $order->order_no, + // '定金/订金', + // $order->timeout, + // '定金/订金', + // '小程序' + // ], + // [ + // $order->mobile + // ], + // ); + // } + // } + //} } } From 5bf28acf95fc04cd3b8df225b61bcd73c9dc214b Mon Sep 17 00:00:00 2001 From: lemon <15040771@qq.com> Date: Mon, 13 Sep 2021 23:57:47 +0800 Subject: [PATCH 07/10] 1 --- app/Console/Commands/BalanceDue.php | 47 +++++++++++++------------- app/Console/Commands/DemandTimeout.php | 1 - app/Console/Kernel.php | 2 +- 3 files changed, 24 insertions(+), 26 deletions(-) diff --git a/app/Console/Commands/BalanceDue.php b/app/Console/Commands/BalanceDue.php index ea03d66..56c54d0 100644 --- a/app/Console/Commands/BalanceDue.php +++ b/app/Console/Commands/BalanceDue.php @@ -43,29 +43,28 @@ class BalanceDue extends Command */ public function handle() { - Log::info(111); - //if (env('SMS_SWITCH' , '') == true) { - // $orders = Order::query() - // ->where('status', OrderStatus::PAY_EARNEST) - // ->get(); - // $sms = new SmsService(); - // foreach ($orders as $order) { - // if (!empty($order->mobile)) { - // $sms->send( - // 'pay', - // [ - // $order->order_no, - // '定金/订金', - // $order->timeout, - // '定金/订金', - // '小程序' - // ], - // [ - // $order->mobile - // ], - // ); - // } - // } - //} + if (env('SMS_SWITCH' , '') == true) { + $orders = Order::query() + ->where('status', OrderStatus::PAY_EARNEST) + ->get(); + $sms = new SmsService(); + foreach ($orders as $order) { + if (!empty($order->mobile)) { + $sms->send( + 'pay', + [ + $order->order_no, + '定金/订金', + $order->timeout, + '定金/订金', + '小程序' + ], + [ + $order->mobile + ], + ); + } + } + } } } diff --git a/app/Console/Commands/DemandTimeout.php b/app/Console/Commands/DemandTimeout.php index 74d525d..e0b00b3 100644 --- a/app/Console/Commands/DemandTimeout.php +++ b/app/Console/Commands/DemandTimeout.php @@ -40,7 +40,6 @@ class DemandTimeout extends Command */ public function handle() { - Log::info(222); //Log::info('定时任务'); Demand::query() ->where('deadline','<=' ,now()) diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index 81ef277..cc7d34a 100644 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -27,7 +27,7 @@ class Kernel extends ConsoleKernel protected function schedule(Schedule $schedule) { $schedule->command('demand:timeout')->everyMinute(); - $schedule->command('balance:due')->everyMinute(); + $schedule->command('balance:due')->dailyAt('00:00'); // $schedule->command('inspire')->hourly(); } From 64d82d886589ab33e3020effa1d94243a3eeba1c Mon Sep 17 00:00:00 2001 From: lemon <15040771@qq.com> Date: Tue, 14 Sep 2021 00:01:23 +0800 Subject: [PATCH 08/10] 1 --- app/Console/Kernel.php | 2 +- app/Jobs/BalanceDue.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index cc7d34a..81ef277 100644 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -27,7 +27,7 @@ class Kernel extends ConsoleKernel protected function schedule(Schedule $schedule) { $schedule->command('demand:timeout')->everyMinute(); - $schedule->command('balance:due')->dailyAt('00:00'); + $schedule->command('balance:due')->everyMinute(); // $schedule->command('inspire')->hourly(); } diff --git a/app/Jobs/BalanceDue.php b/app/Jobs/BalanceDue.php index c644318..eeefd44 100644 --- a/app/Jobs/BalanceDue.php +++ b/app/Jobs/BalanceDue.php @@ -39,7 +39,7 @@ class BalanceDue implements ShouldQueue public function handle() { $order = Order::query()->where('order_no',$this->orderNumber)->first(); - if(env('SMS_SWITCH' , '') == true && !empty($order->status) && ($order->status == OrderStatus::PAID || $order->status == OrderStatus::PAID_RETAINAGE)){ + if(env('SMS_SWITCH' , '') == true && !empty($order->status) && $order->status == OrderStatus::PAY_EARNEST){ Log::info('队列执行'); $sms = new SmsService(); $sms->send('demand',['订单号:'.$this->orderNumber,'测试2',SmsTraits::$systeaNameText['supplier']],[15677177320]); From 17f0da94a4bb54e40bfd712ce792025d513b8813 Mon Sep 17 00:00:00 2001 From: lemon <15040771@qq.com> Date: Tue, 14 Sep 2021 00:19:29 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/Api/TestController.php | 25 ++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/Api/TestController.php b/app/Http/Controllers/Api/TestController.php index 9287a04..819a73d 100644 --- a/app/Http/Controllers/Api/TestController.php +++ b/app/Http/Controllers/Api/TestController.php @@ -2,10 +2,12 @@ namespace App\Http\Controllers\Api; +use App\Common\OrderStatus; use App\Models\Agent; use App\Models\Order; use App\Models\OrderProductItem; use App\Models\Product; +use App\Service\SmsService; use Illuminate\Support\Facades\Cache; use Illuminate\Support\Facades\DB; @@ -18,7 +20,28 @@ class TestController { public function index() { - return $this->login(2); + $orders = Order::query() + ->where('status', OrderStatus::PAY_EARNEST) + ->get(); + $sms = new SmsService(); + foreach ($orders as $order) { + if (!empty($order->mobile)) { + $sms->send( + 'pay', + [ + $order->order_no, + '定金/订金', + $order->timeout, + '定金/订金', + '小程序' + ], + [ + $order->mobile + ], + ); + } + } + return 2; } /** From 0ec576fed3ea630bf49bbf3a20897c8a34f8859c Mon Sep 17 00:00:00 2001 From: lemon <15040771@qq.com> Date: Tue, 14 Sep 2021 00:24:18 +0800 Subject: [PATCH 10/10] 1 --- config/sms.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/sms.php b/config/sms.php index a42f84e..c1fc50d 100644 --- a/config/sms.php +++ b/config/sms.php @@ -8,7 +8,7 @@ return [ 'sms_sdk_app_id'=> env('SMS_SDK_APP_ID'), 'secret_id' => env('SECRET_ID'), 'secret_key' => env('SECRET_KEY'), - 'sign_name' => '领峰远扬', + 'sign_name' => '易游天下', 'templates' => [ 'bidding' => '1120251', //{竞标人的公司名称}]参与了您发起的竞标{编号}，详情请登录{系统名称}查看。 'demand' => '1120254', //恭喜您中标啦！竞标[{编号}]已成功中标！详情请登录{系统名称}查看。