Merge remote-tracking branch 'origin/develop' into develop

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')->everyMinute();
         // $schedule->command('inspire')->hourly();
     }
 

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;
 	}
 
 	/**

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]);

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', //恭喜您中标啦！竞标[{编号}]已成功中标！详情请登录{系统名称}查看。