Merge remote-tracking branch 'origin/master'

app/AdminAgent/Controllers/DemandController.php

@@ -180,8 +180,11 @@ class DemandController extends AdminController
 					->default(1)
 					->required();
 			}
-			$form->decimal('price')->required()->type('number')->attribute('min', 0);
-            $form->number('stock')->required()->min(1);
+			$form->decimal('price','价格')->rules('required|numeric|min:0|not_in:0',[
+				'*' => '金额为必填字段且必须大于0',
+			]);
+
+			$form->number('stock')->required()->min(1);
             $form->hidden('publisher_type');
             $form->hidden('publisher_id');
 			$form->saving(function (Form $form) {

app/Events/DepositUpdate.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Events;
+
+use App\Models\Supplier;
+use Illuminate\Broadcasting\Channel;
+use Illuminate\Broadcasting\InteractsWithSockets;
+use Illuminate\Broadcasting\PresenceChannel;
+use Illuminate\Broadcasting\PrivateChannel;
+use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\Log;
+
+class DepositUpdate
+{
+    use Dispatchable, InteractsWithSockets, SerializesModels;
+
+    public $supplier;
+
+    /**
+     * Create a new event instance.
+     *
+     * @return void
+     */
+    public function __construct(Supplier $supplier)
+    {
+        $this->supplier = $supplier;
+    }
+}

app/Listeners/SupplierEventSubscriber.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Listeners;
+
+use App\Events\DepositUpdate;
+use Illuminate\Support\Facades\Log;
+
+class SupplierEventSubscriber
+{
+    public function onSupplierUpdated($event)
+	{
+		//处理流水事务
+		
+	}
+
+	/**
+	 * 为订阅者注册监听器
+	 *
+	 * @param  Illuminate\Events\Dispatcher $events
+	 */
+	public function subscribe($events)
+	{
+		$events->listen(
+			DepositUpdate::class,
+			SupplierEventSubscriber::class . '@onSupplierUpdated'
+		);
+	}
+}

app/Models/Supplier.php

@@ -2,6 +2,7 @@
 
 namespace App\Models;
 
+use App\Events\DepositUpdate;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
@@ -11,6 +12,10 @@ class Supplier extends BaseModel
 
 	protected $casts = ['publish_type' => 'json'];
 
+	protected $dispatchesEvents = [
+		'updated' => DepositUpdate::class
+	];
+
 	//密码修改
 	public function setPasswordAttribute($value)
 	{

app/Providers/EventServiceProvider.php

@@ -2,6 +2,7 @@
 
 namespace App\Providers;
 
+use App\Listeners\SupplierEventSubscriber;
 use Illuminate\Auth\Events\Registered;
 use Illuminate\Auth\Listeners\SendEmailVerificationNotification;
 use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
@@ -29,4 +30,8 @@ class EventServiceProvider extends ServiceProvider
     {
         //
     }
+
+    protected $subscribe = [
+    	SupplierEventSubscriber::class,
+	];
 }

database/migrations/2021_09_17_141510_update_supplier_secend_table.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class UpdateSupplierSecendTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+		Schema::table('suppliers', function (Blueprint $table) {
+			$table->decimal('deposit_normal',10,2)->change();
+			$table->decimal('deposit_frozen',10,2)->change();
+			$table->decimal('deposit_used',10,2)->change();
+		});
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}