From 5c6b2c2b01b21767d39f1691d6a52ce078db2f97 Mon Sep 17 00:00:00 2001
From: vine_liutk <961510893@qq.com>
Date: Fri, 10 Dec 2021 13:25:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=95=86=E5=93=81=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E7=94=B3=E8=AF=B7=E4=BA=BA=E5=92=8C=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProductSkuVerifyController.php            |  4 ++-
 app/Models/ProductSkuVerify.php               | 21 +++++++++++
 app/Traits/Release.php                        |  3 ++
 ...reviewer_to_product_sku_verifies_table.php | 36 +++++++++++++++++++
 resources/lang/zh_CN/product-sku-verify.php   |  6 ++++
 5 files changed, 69 insertions(+), 1 deletion(-)
 create mode 100644 database/migrations/2021_12_10_130645_add_applicant_and_reviewer_to_product_sku_verifies_table.php

diff --git a/app/Admin/Controllers/ProductSkuVerifyController.php b/app/Admin/Controllers/ProductSkuVerifyController.php
index c1345b64..f0aded79 100644
--- a/app/Admin/Controllers/ProductSkuVerifyController.php
+++ b/app/Admin/Controllers/ProductSkuVerifyController.php
@@ -20,7 +20,7 @@ class ProductSkuVerifyController extends AdminController
      */
     protected function grid()
     {
-        $builder = ProductSkuVerify::with('sku');
+        $builder = ProductSkuVerify::with(['sku', 'applicant', 'reviewer']);
         return Grid::make($builder, function (Grid $grid) {
             $grid->showRowSelector();
             $grid->rowSelector()->disable(function ($row) {
@@ -33,6 +33,8 @@ class ProductSkuVerifyController extends AdminController
             });
             $grid->column('id')->sortable();
             $grid->column('sku.name');
+            $grid->column('applicant.name');
+            $grid->column('reviewer.name');
             // $grid->column('type');
             $grid->column('status')
                 ->using([
diff --git a/app/Models/ProductSkuVerify.php b/app/Models/ProductSkuVerify.php
index 7ebd5575..f57a53bd 100644
--- a/app/Models/ProductSkuVerify.php
+++ b/app/Models/ProductSkuVerify.php
@@ -2,6 +2,7 @@
 
 namespace App\Models;
 
+use App\Models\Admin\Administrator;
 use Dcat\Admin\Traits\HasDateTimeFormatter;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
@@ -15,4 +16,24 @@ class ProductSkuVerify extends Model
     {
         return $this->belongsTo(ProductSku::class, 'sku_id');
     }
+
+    /**
+     * 申请人
+     *
+     * @return void
+     */
+    public function applicant()
+    {
+        return $this->belongsTo(Administrator::class, 'applicant_id');
+    }
+
+    /**
+     * 审核人
+     *
+     * @return void
+     */
+    public function reviewer()
+    {
+        return $this->belongsTo(Administrator::class, 'reviewer_id');
+    }
 }
diff --git a/app/Traits/Release.php b/app/Traits/Release.php
index c5434c31..34e653aa 100644
--- a/app/Traits/Release.php
+++ b/app/Traits/Release.php
@@ -4,6 +4,7 @@ namespace App\Traits;
 
 use App\Models\ProductSku;
 use App\Models\ProductSkuVerify;
+use Dcat\Admin\Admin;
 
 trait Release
 {
@@ -28,6 +29,7 @@ trait Release
         ProductSkuVerify::query()->insert(array_map(function ($key) use ($nowTime) {
             return [
                 'sku_id' => $key,
+                'applicant_id'=> Admin::user()->id,
                 'created_at' => $nowTime,
                 'updated_at' => $nowTime,
             ];
@@ -103,6 +105,7 @@ trait Release
         }
 
         ProductSkuVerify::whereIn('sku_id', $ids)->where('status', 0)->update([
+            'reviewer_id' => Admin::user()->id,
             'status'=>$status,
             'remarks'=>$remarks,
         ]);
diff --git a/database/migrations/2021_12_10_130645_add_applicant_and_reviewer_to_product_sku_verifies_table.php b/database/migrations/2021_12_10_130645_add_applicant_and_reviewer_to_product_sku_verifies_table.php
new file mode 100644
index 00000000..8d1075da
--- /dev/null
+++ b/database/migrations/2021_12_10_130645_add_applicant_and_reviewer_to_product_sku_verifies_table.php
@@ -0,0 +1,36 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddApplicantAndReviewerToProductSkuVerifiesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('product_sku_verifies', function (Blueprint $table) {
+            //
+            $table->unsignedBigInteger('applicant_id')->comment('申请人ID');
+            $table->unsignedBigInteger('reviewer_id')->nullable()->comment('审核人ID');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('product_sku_verifies', function (Blueprint $table) {
+            //
+            $table->dropColumn('applicant_id');
+            $table->dropColumn('reviewer_id');
+        });
+    }
+}
diff --git a/resources/lang/zh_CN/product-sku-verify.php b/resources/lang/zh_CN/product-sku-verify.php
index a511c0b3..82c2f258 100644
--- a/resources/lang/zh_CN/product-sku-verify.php
+++ b/resources/lang/zh_CN/product-sku-verify.php
@@ -9,6 +9,12 @@ return [
         'sku'=>[
             'name'=>'商品名称',
         ],
+        'applicant' => [
+            'name' => '申请人',
+        ],
+        'reviewer'=>[
+            'name' => '审核人',
+        ],
         'sku_id' => '子商品',
         'type' => '审核类别',
         'status' => '状态',