From abac208c3f08d28611af8de43b5b6518e9c32409 Mon Sep 17 00:00:00 2001
From: vine_liutk <961510893@qq.com>
Date: Wed, 8 Dec 2021 17:53:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E5=8F=91=E6=94=BE?=
 =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/CouponSendLogController.php   |  77 +++++++++
 .../Controllers/CouponSendTaskController.php  |  80 +++++++++
 .../Controllers/ProductSpuController.php      |  26 +--
 .../Controllers/ShippingRuleController.php    |  21 ++-
 app/Admin/Repositories/CouponSendLog.php      |  16 ++
 app/Admin/Repositories/CouponSendTask.php     |  16 ++
 app/Admin/routes.php                          |   5 +
 app/Models/CouponSendLog.php                  |  11 ++
 app/Models/CouponSendTask.php                 |  11 ++
 app/Models/ShippingRule.php                   |   2 +-
 ..._164534_create_coupon_send_tasks_table.php |  37 ++++
 ...8_164542_create_coupon_send_logs_table.php |  38 +++++
 dcat_admin_ide_helper.php                     | 160 ++++++++++++++----
 resources/lang/zh_CN/coupon-send-log.php      |  16 ++
 resources/lang/zh_CN/coupon-send-task.php     |  17 ++
 15 files changed, 484 insertions(+), 49 deletions(-)
 create mode 100644 app/Admin/Controllers/CouponSendLogController.php
 create mode 100644 app/Admin/Controllers/CouponSendTaskController.php
 create mode 100644 app/Admin/Repositories/CouponSendLog.php
 create mode 100644 app/Admin/Repositories/CouponSendTask.php
 create mode 100644 app/Models/CouponSendLog.php
 create mode 100644 app/Models/CouponSendTask.php
 create mode 100644 database/migrations/2021_12_08_164534_create_coupon_send_tasks_table.php
 create mode 100644 database/migrations/2021_12_08_164542_create_coupon_send_logs_table.php
 create mode 100644 resources/lang/zh_CN/coupon-send-log.php
 create mode 100644 resources/lang/zh_CN/coupon-send-task.php

diff --git a/app/Admin/Controllers/CouponSendLogController.php b/app/Admin/Controllers/CouponSendLogController.php
new file mode 100644
index 00000000..33f47b4e
--- /dev/null
+++ b/app/Admin/Controllers/CouponSendLogController.php
@@ -0,0 +1,77 @@
+<?php
+
+namespace App\Admin\Controllers;
+
+use App\Admin\Repositories\CouponSendLog;
+use Dcat\Admin\Form;
+use Dcat\Admin\Grid;
+use Dcat\Admin\Show;
+use Dcat\Admin\Http\Controllers\AdminController;
+
+class CouponSendLogController extends AdminController
+{
+    /**
+     * Make a grid builder.
+     *
+     * @return Grid
+     */
+    protected function grid()
+    {
+        return Grid::make(new CouponSendLog(), function (Grid $grid) {
+            $grid->column('id')->sortable();
+            $grid->column('task_id');
+            $grid->column('coupon_id');
+            $grid->column('user_id');
+            $grid->column('num');
+            $grid->column('status');
+            $grid->column('created_at');
+            $grid->column('updated_at')->sortable();
+        
+            $grid->filter(function (Grid\Filter $filter) {
+                $filter->equal('id');
+        
+            });
+        });
+    }
+
+    /**
+     * Make a show builder.
+     *
+     * @param mixed $id
+     *
+     * @return Show
+     */
+    protected function detail($id)
+    {
+        return Show::make($id, new CouponSendLog(), function (Show $show) {
+            $show->field('id');
+            $show->field('task_id');
+            $show->field('coupon_id');
+            $show->field('user_id');
+            $show->field('num');
+            $show->field('status');
+            $show->field('created_at');
+            $show->field('updated_at');
+        });
+    }
+
+    /**
+     * Make a form builder.
+     *
+     * @return Form
+     */
+    protected function form()
+    {
+        return Form::make(new CouponSendLog(), function (Form $form) {
+            $form->display('id');
+            $form->text('task_id');
+            $form->text('coupon_id');
+            $form->text('user_id');
+            $form->text('num');
+            $form->text('status');
+        
+            $form->display('created_at');
+            $form->display('updated_at');
+        });
+    }
+}
diff --git a/app/Admin/Controllers/CouponSendTaskController.php b/app/Admin/Controllers/CouponSendTaskController.php
new file mode 100644
index 00000000..e937438e
--- /dev/null
+++ b/app/Admin/Controllers/CouponSendTaskController.php
@@ -0,0 +1,80 @@
+<?php
+
+namespace App\Admin\Controllers;
+
+use App\Admin\Repositories\CouponSendTask;
+use Dcat\Admin\Form;
+use Dcat\Admin\Grid;
+use Dcat\Admin\Show;
+use Dcat\Admin\Http\Controllers\AdminController;
+
+class CouponSendTaskController extends AdminController
+{
+    /**
+     * Make a grid builder.
+     *
+     * @return Grid
+     */
+    protected function grid()
+    {
+        return Grid::make(new CouponSendTask(), function (Grid $grid) {
+            $grid->column('id')->sortable();
+            $grid->column('name');
+            $grid->column('coupon_id');
+            $grid->column('num');
+            $grid->column('administrator_id');
+            $grid->column('type');
+            $grid->column('status');
+            $grid->column('created_at');
+            $grid->column('updated_at')->sortable();
+        
+            $grid->filter(function (Grid\Filter $filter) {
+                $filter->equal('id');
+        
+            });
+        });
+    }
+
+    /**
+     * Make a show builder.
+     *
+     * @param mixed $id
+     *
+     * @return Show
+     */
+    protected function detail($id)
+    {
+        return Show::make($id, new CouponSendTask(), function (Show $show) {
+            $show->field('id');
+            $show->field('name');
+            $show->field('coupon_id');
+            $show->field('num');
+            $show->field('administrator_id');
+            $show->field('type');
+            $show->field('status');
+            $show->field('created_at');
+            $show->field('updated_at');
+        });
+    }
+
+    /**
+     * Make a form builder.
+     *
+     * @return Form
+     */
+    protected function form()
+    {
+        return Form::make(new CouponSendTask(), function (Form $form) {
+            $form->display('id');
+            $form->text('name');
+            $form->text('coupon_id');
+            $form->text('num');
+            $form->text('administrator_id');
+            $form->text('type');
+            $form->text('status');
+        
+            $form->display('created_at');
+            $form->display('updated_at');
+        });
+    }
+}
diff --git a/app/Admin/Controllers/ProductSpuController.php b/app/Admin/Controllers/ProductSpuController.php
index fbbd6002..46832c98 100644
--- a/app/Admin/Controllers/ProductSpuController.php
+++ b/app/Admin/Controllers/ProductSpuController.php
@@ -2,22 +2,22 @@
 
 namespace App\Admin\Controllers;
 
-use Carbon\Carbon;
-use Dcat\Admin\Form;
-use Dcat\Admin\Grid;
-use Dcat\Admin\Show;
-use Dcat\Admin\Admin;
-use App\Models\ProductGroup;
+use App\Admin\Actions\Grid\SkuList;
+use App\Admin\Renderable\ProductSkuTable;
+use App\Admin\Repositories\ProductSpu;
+use App\Exceptions\BizException;
 use App\Models\ProductBuynote;
 use App\Models\ProductFeature;
-use Dcat\Admin\Layout\Content;
-use App\Exceptions\BizException;
-use App\Models\ShippingTemplate;
-use App\Admin\Actions\Grid\SkuList;
-use App\Admin\Repositories\ProductSpu;
-use App\Admin\Renderable\ProductSkuTable;
+use App\Models\ProductGroup;
 use App\Models\ProductSpu as ProductSpuModel;
+use App\Models\ShippingTemplate;
+use Carbon\Carbon;
+use Dcat\Admin\Admin;
+use Dcat\Admin\Form;
+use Dcat\Admin\Grid;
 use Dcat\Admin\Http\Controllers\AdminController;
+use Dcat\Admin\Layout\Content;
+use Dcat\Admin\Show;
 
 class ProductSpuController extends AdminController
 {
@@ -143,7 +143,7 @@ class ProductSpuController extends AdminController
             $form->editor('description');
             $form->select('buynote_id')->options(ProductBuynote::all()->pluck('name', 'id'));
             $form->number('weight');
-            $form->select('shipping_template_id')->options(ShippingTemplate::all()->pluck('name', 'id'));
+            $form->select('shipping_template_id')->options(ShippingTemplate::all()->pluck('name', 'id'))->required();
             $form->number('stock');
             $form->divider();
             $form->currency('sell_price')->symbol('￥')->default(0);
diff --git a/app/Admin/Controllers/ShippingRuleController.php b/app/Admin/Controllers/ShippingRuleController.php
index 3234aaa0..d37c2b25 100644
--- a/app/Admin/Controllers/ShippingRuleController.php
+++ b/app/Admin/Controllers/ShippingRuleController.php
@@ -4,6 +4,7 @@ namespace App\Admin\Controllers;
 
 use App\Admin\Renderable\ShippingRuleTable;
 use App\Admin\Repositories\ShippingRule;
+use App\Models\ShippingRule as ShippingRuleModel;
 use App\Models\ShippingTemplate;
 use App\Models\Zone;
 use Dcat\Admin\Form;
@@ -82,7 +83,7 @@ class ShippingRuleController extends AdminController
                         } else {
                             return [];
                         }
-                    })->saveAsJson();
+                    });
                 })
                 ->when(2, function (Form $form) {
                     $form->embeds('info2', function ($form) {
@@ -96,7 +97,7 @@ class ShippingRuleController extends AdminController
                         } else {
                             return [];
                         }
-                    })->saveAsJson();
+                    });
                 })
                 ->options([
                     1 => '包邮',
@@ -108,7 +109,7 @@ class ShippingRuleController extends AdminController
 
             $form->saving(function (Form $form) {
                 $info = 'info'.$form->type;
-                $form->info = $form->$info;
+                $form->info = json_encode($form->$info);
 
                 $form->deleteInput('info1');
                 $form->deleteInput('info2');
@@ -118,4 +119,18 @@ class ShippingRuleController extends AdminController
             $form->display('updated_at');
         });
     }
+
+    /**
+     * 重构删除
+     *
+     * @param [type] $id
+     * @return void
+     */
+    public function destroy($id)
+    {
+        $rule = ShippingRuleModel::findOrFail($id);
+        $rule->zones()->detach();
+
+        return parent::destroy($id);
+    }
 }
diff --git a/app/Admin/Repositories/CouponSendLog.php b/app/Admin/Repositories/CouponSendLog.php
new file mode 100644
index 00000000..4e8961db
--- /dev/null
+++ b/app/Admin/Repositories/CouponSendLog.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Admin\Repositories;
+
+use App\Models\CouponSendLog as Model;
+use Dcat\Admin\Repositories\EloquentRepository;
+
+class CouponSendLog extends EloquentRepository
+{
+    /**
+     * Model.
+     *
+     * @var string
+     */
+    protected $eloquentClass = Model::class;
+}
diff --git a/app/Admin/Repositories/CouponSendTask.php b/app/Admin/Repositories/CouponSendTask.php
new file mode 100644
index 00000000..b41002a7
--- /dev/null
+++ b/app/Admin/Repositories/CouponSendTask.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Admin\Repositories;
+
+use App\Models\CouponSendTask as Model;
+use Dcat\Admin\Repositories\EloquentRepository;
+
+class CouponSendTask extends EloquentRepository
+{
+    /**
+     * Model.
+     *
+     * @var string
+     */
+    protected $eloquentClass = Model::class;
+}
diff --git a/app/Admin/routes.php b/app/Admin/routes.php
index 39b18a80..8c58a717 100644
--- a/app/Admin/routes.php
+++ b/app/Admin/routes.php
@@ -74,6 +74,11 @@ Route::group([
         'create', 'store', 'edit', 'update', 'destroy',
     ])->names('coupon_ranges');
 
+    $router->resource('coupon-send-tasks', 'CouponSendTaskController')->names('coupon_send_tasks');
+    $router->resource('coupon-send-logs', 'CouponSendLogController')->only([
+        'index',
+    ])->names('coupon_send_logs');
+
     $router->resource('users', 'UserController');
 
     $router->resource('vips', 'VipController');
diff --git a/app/Models/CouponSendLog.php b/app/Models/CouponSendLog.php
new file mode 100644
index 00000000..74dd3944
--- /dev/null
+++ b/app/Models/CouponSendLog.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class CouponSendLog extends Model
+{
+    use HasFactory;
+}
diff --git a/app/Models/CouponSendTask.php b/app/Models/CouponSendTask.php
new file mode 100644
index 00000000..20fa35e2
--- /dev/null
+++ b/app/Models/CouponSendTask.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class CouponSendTask extends Model
+{
+    use HasFactory;
+}
diff --git a/app/Models/ShippingRule.php b/app/Models/ShippingRule.php
index 4b2ead47..12213d36 100644
--- a/app/Models/ShippingRule.php
+++ b/app/Models/ShippingRule.php
@@ -18,6 +18,6 @@ class ShippingRule extends Model
 
     public function zones()
     {
-        return $this->belongsToMany(Zone::class, 'shipping_rule_zones', 'rule_id', 'zone_id');
+        return $this->belongsToMany(Zone::class, 'shipping_rule_zones', 'rule_id', 'zone_id')->withTimestamps();
     }
 }
diff --git a/database/migrations/2021_12_08_164534_create_coupon_send_tasks_table.php b/database/migrations/2021_12_08_164534_create_coupon_send_tasks_table.php
new file mode 100644
index 00000000..a68e1730
--- /dev/null
+++ b/database/migrations/2021_12_08_164534_create_coupon_send_tasks_table.php
@@ -0,0 +1,37 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateCouponSendTasksTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('coupon_send_tasks', function (Blueprint $table) {
+            $table->id();
+            $table->string('name')->comment('任务名称');
+            $table->unsignedBigInteger('coupon_id')->comment('优惠券ID');
+            $table->unsignedBigInteger('num')->default(1)->comment('张数');
+            $table->unsignedBigInteger('administrator_id')->comment('操作管理员ID');
+            $table->unsignedTinyInteger('type')->comment('任务类型');
+            $table->unsignedTinyInteger('status')->default(0)->comment('任务状态:0未开始，1初始化中，2执行中，3已完成');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('coupon_send_tasks');
+    }
+}
diff --git a/database/migrations/2021_12_08_164542_create_coupon_send_logs_table.php b/database/migrations/2021_12_08_164542_create_coupon_send_logs_table.php
new file mode 100644
index 00000000..3162f422
--- /dev/null
+++ b/database/migrations/2021_12_08_164542_create_coupon_send_logs_table.php
@@ -0,0 +1,38 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateCouponSendLogsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('coupon_send_logs', function (Blueprint $table) {
+            $table->id();
+            $table->unsignedBigInteger('task_id')->comment('任务ID');
+            $table->unsignedBigInteger('coupon_id')->comment('优惠券ID');
+            $table->unsignedBigInteger('user_id')->comment('用户ID');
+            $table->unsignedBigInteger('num')->default(1)->comment('张数');
+            $table->unsignedTinyInteger('status')->default(0)->comment('0未发放，1发放中，2成功，3失败');
+            $table->timestamps();
+
+            $table->unique(['task_id', 'user_id']);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('coupon_send_logs');
+    }
+}
diff --git a/dcat_admin_ide_helper.php b/dcat_admin_ide_helper.php
index c9e57935..46c8b1ca 100644
--- a/dcat_admin_ide_helper.php
+++ b/dcat_admin_ide_helper.php
@@ -61,6 +61,9 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection coupon_id
      * @property Grid\Column|Collection ranges
      * @property Grid\Column|Collection status
+     * @property Grid\Column|Collection num
+     * @property Grid\Column|Collection task_id
+     * @property Grid\Column|Collection administrator_id
      * @property Grid\Column|Collection amount
      * @property Grid\Column|Collection limit
      * @property Grid\Column|Collection sent
@@ -74,6 +77,34 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection payload
      * @property Grid\Column|Collection queue
      * @property Grid\Column|Collection uuid
+     * @property Grid\Column|Collection after_sale_deadline
+     * @property Grid\Column|Collection discount_amount
+     * @property Grid\Column|Collection is_comment
+     * @property Grid\Column|Collection order_id
+     * @property Grid\Column|Collection quantity
+     * @property Grid\Column|Collection reduced_amount
+     * @property Grid\Column|Collection sell_price
+     * @property Grid\Column|Collection sku_id
+     * @property Grid\Column|Collection specs
+     * @property Grid\Column|Collection spu_id
+     * @property Grid\Column|Collection total_amount
+     * @property Grid\Column|Collection vip_amount
+     * @property Grid\Column|Collection vip_price
+     * @property Grid\Column|Collection weight
+     * @property Grid\Column|Collection completed_at
+     * @property Grid\Column|Collection consignee_address
+     * @property Grid\Column|Collection consignee_name
+     * @property Grid\Column|Collection consignee_telephone
+     * @property Grid\Column|Collection consignee_zone
+     * @property Grid\Column|Collection note
+     * @property Grid\Column|Collection pay_at
+     * @property Grid\Column|Collection pay_sn
+     * @property Grid\Column|Collection pay_way
+     * @property Grid\Column|Collection products_total_amount
+     * @property Grid\Column|Collection remark
+     * @property Grid\Column|Collection shipping_fee
+     * @property Grid\Column|Collection sn
+     * @property Grid\Column|Collection user_coupon_id
      * @property Grid\Column|Collection abilities
      * @property Grid\Column|Collection last_used_at
      * @property Grid\Column|Collection token
@@ -81,12 +112,8 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection tokenable_type
      * @property Grid\Column|Collection remarks
      * @property Grid\Column|Collection gift_sku_id
-     * @property Grid\Column|Collection num
-     * @property Grid\Column|Collection sku_id
      * @property Grid\Column|Collection attrs
-     * @property Grid\Column|Collection specs
      * @property Grid\Column|Collection part_id
-     * @property Grid\Column|Collection spu_id
      * @property Grid\Column|Collection buynote_id
      * @property Grid\Column|Collection cost_price
      * @property Grid\Column|Collection images
@@ -94,11 +121,9 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection media
      * @property Grid\Column|Collection release_at
      * @property Grid\Column|Collection sales
-     * @property Grid\Column|Collection sell_price
+     * @property Grid\Column|Collection shipping_template_id
      * @property Grid\Column|Collection stock
      * @property Grid\Column|Collection verify_state
-     * @property Grid\Column|Collection vip_price
-     * @property Grid\Column|Collection weight
      * @property Grid\Column|Collection feature_id
      * @property Grid\Column|Collection items
      * @property Grid\Column|Collection product_spu_id
@@ -106,7 +131,6 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection rule_id
      * @property Grid\Column|Collection info
      * @property Grid\Column|Collection template_id
-     * @property Grid\Column|Collection quantity
      * @property Grid\Column|Collection code
      * @property Grid\Column|Collection expires_at
      * @property Grid\Column|Collection is_use
@@ -179,6 +203,9 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection coupon_id(string $label = null)
      * @method Grid\Column|Collection ranges(string $label = null)
      * @method Grid\Column|Collection status(string $label = null)
+     * @method Grid\Column|Collection num(string $label = null)
+     * @method Grid\Column|Collection task_id(string $label = null)
+     * @method Grid\Column|Collection administrator_id(string $label = null)
      * @method Grid\Column|Collection amount(string $label = null)
      * @method Grid\Column|Collection limit(string $label = null)
      * @method Grid\Column|Collection sent(string $label = null)
@@ -192,6 +219,34 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection payload(string $label = null)
      * @method Grid\Column|Collection queue(string $label = null)
      * @method Grid\Column|Collection uuid(string $label = null)
+     * @method Grid\Column|Collection after_sale_deadline(string $label = null)
+     * @method Grid\Column|Collection discount_amount(string $label = null)
+     * @method Grid\Column|Collection is_comment(string $label = null)
+     * @method Grid\Column|Collection order_id(string $label = null)
+     * @method Grid\Column|Collection quantity(string $label = null)
+     * @method Grid\Column|Collection reduced_amount(string $label = null)
+     * @method Grid\Column|Collection sell_price(string $label = null)
+     * @method Grid\Column|Collection sku_id(string $label = null)
+     * @method Grid\Column|Collection specs(string $label = null)
+     * @method Grid\Column|Collection spu_id(string $label = null)
+     * @method Grid\Column|Collection total_amount(string $label = null)
+     * @method Grid\Column|Collection vip_amount(string $label = null)
+     * @method Grid\Column|Collection vip_price(string $label = null)
+     * @method Grid\Column|Collection weight(string $label = null)
+     * @method Grid\Column|Collection completed_at(string $label = null)
+     * @method Grid\Column|Collection consignee_address(string $label = null)
+     * @method Grid\Column|Collection consignee_name(string $label = null)
+     * @method Grid\Column|Collection consignee_telephone(string $label = null)
+     * @method Grid\Column|Collection consignee_zone(string $label = null)
+     * @method Grid\Column|Collection note(string $label = null)
+     * @method Grid\Column|Collection pay_at(string $label = null)
+     * @method Grid\Column|Collection pay_sn(string $label = null)
+     * @method Grid\Column|Collection pay_way(string $label = null)
+     * @method Grid\Column|Collection products_total_amount(string $label = null)
+     * @method Grid\Column|Collection remark(string $label = null)
+     * @method Grid\Column|Collection shipping_fee(string $label = null)
+     * @method Grid\Column|Collection sn(string $label = null)
+     * @method Grid\Column|Collection user_coupon_id(string $label = null)
      * @method Grid\Column|Collection abilities(string $label = null)
      * @method Grid\Column|Collection last_used_at(string $label = null)
      * @method Grid\Column|Collection token(string $label = null)
@@ -199,12 +254,8 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection tokenable_type(string $label = null)
      * @method Grid\Column|Collection remarks(string $label = null)
      * @method Grid\Column|Collection gift_sku_id(string $label = null)
-     * @method Grid\Column|Collection num(string $label = null)
-     * @method Grid\Column|Collection sku_id(string $label = null)
      * @method Grid\Column|Collection attrs(string $label = null)
-     * @method Grid\Column|Collection specs(string $label = null)
      * @method Grid\Column|Collection part_id(string $label = null)
-     * @method Grid\Column|Collection spu_id(string $label = null)
      * @method Grid\Column|Collection buynote_id(string $label = null)
      * @method Grid\Column|Collection cost_price(string $label = null)
      * @method Grid\Column|Collection images(string $label = null)
@@ -212,11 +263,9 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection media(string $label = null)
      * @method Grid\Column|Collection release_at(string $label = null)
      * @method Grid\Column|Collection sales(string $label = null)
-     * @method Grid\Column|Collection sell_price(string $label = null)
+     * @method Grid\Column|Collection shipping_template_id(string $label = null)
      * @method Grid\Column|Collection stock(string $label = null)
      * @method Grid\Column|Collection verify_state(string $label = null)
-     * @method Grid\Column|Collection vip_price(string $label = null)
-     * @method Grid\Column|Collection weight(string $label = null)
      * @method Grid\Column|Collection feature_id(string $label = null)
      * @method Grid\Column|Collection items(string $label = null)
      * @method Grid\Column|Collection product_spu_id(string $label = null)
@@ -224,7 +273,6 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection rule_id(string $label = null)
      * @method Grid\Column|Collection info(string $label = null)
      * @method Grid\Column|Collection template_id(string $label = null)
-     * @method Grid\Column|Collection quantity(string $label = null)
      * @method Grid\Column|Collection code(string $label = null)
      * @method Grid\Column|Collection expires_at(string $label = null)
      * @method Grid\Column|Collection is_use(string $label = null)
@@ -302,6 +350,9 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection coupon_id
      * @property Show\Field|Collection ranges
      * @property Show\Field|Collection status
+     * @property Show\Field|Collection num
+     * @property Show\Field|Collection task_id
+     * @property Show\Field|Collection administrator_id
      * @property Show\Field|Collection amount
      * @property Show\Field|Collection limit
      * @property Show\Field|Collection sent
@@ -315,6 +366,34 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection payload
      * @property Show\Field|Collection queue
      * @property Show\Field|Collection uuid
+     * @property Show\Field|Collection after_sale_deadline
+     * @property Show\Field|Collection discount_amount
+     * @property Show\Field|Collection is_comment
+     * @property Show\Field|Collection order_id
+     * @property Show\Field|Collection quantity
+     * @property Show\Field|Collection reduced_amount
+     * @property Show\Field|Collection sell_price
+     * @property Show\Field|Collection sku_id
+     * @property Show\Field|Collection specs
+     * @property Show\Field|Collection spu_id
+     * @property Show\Field|Collection total_amount
+     * @property Show\Field|Collection vip_amount
+     * @property Show\Field|Collection vip_price
+     * @property Show\Field|Collection weight
+     * @property Show\Field|Collection completed_at
+     * @property Show\Field|Collection consignee_address
+     * @property Show\Field|Collection consignee_name
+     * @property Show\Field|Collection consignee_telephone
+     * @property Show\Field|Collection consignee_zone
+     * @property Show\Field|Collection note
+     * @property Show\Field|Collection pay_at
+     * @property Show\Field|Collection pay_sn
+     * @property Show\Field|Collection pay_way
+     * @property Show\Field|Collection products_total_amount
+     * @property Show\Field|Collection remark
+     * @property Show\Field|Collection shipping_fee
+     * @property Show\Field|Collection sn
+     * @property Show\Field|Collection user_coupon_id
      * @property Show\Field|Collection abilities
      * @property Show\Field|Collection last_used_at
      * @property Show\Field|Collection token
@@ -322,12 +401,8 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection tokenable_type
      * @property Show\Field|Collection remarks
      * @property Show\Field|Collection gift_sku_id
-     * @property Show\Field|Collection num
-     * @property Show\Field|Collection sku_id
      * @property Show\Field|Collection attrs
-     * @property Show\Field|Collection specs
      * @property Show\Field|Collection part_id
-     * @property Show\Field|Collection spu_id
      * @property Show\Field|Collection buynote_id
      * @property Show\Field|Collection cost_price
      * @property Show\Field|Collection images
@@ -335,11 +410,9 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection media
      * @property Show\Field|Collection release_at
      * @property Show\Field|Collection sales
-     * @property Show\Field|Collection sell_price
+     * @property Show\Field|Collection shipping_template_id
      * @property Show\Field|Collection stock
      * @property Show\Field|Collection verify_state
-     * @property Show\Field|Collection vip_price
-     * @property Show\Field|Collection weight
      * @property Show\Field|Collection feature_id
      * @property Show\Field|Collection items
      * @property Show\Field|Collection product_spu_id
@@ -347,7 +420,6 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection rule_id
      * @property Show\Field|Collection info
      * @property Show\Field|Collection template_id
-     * @property Show\Field|Collection quantity
      * @property Show\Field|Collection code
      * @property Show\Field|Collection expires_at
      * @property Show\Field|Collection is_use
@@ -420,6 +492,9 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection coupon_id(string $label = null)
      * @method Show\Field|Collection ranges(string $label = null)
      * @method Show\Field|Collection status(string $label = null)
+     * @method Show\Field|Collection num(string $label = null)
+     * @method Show\Field|Collection task_id(string $label = null)
+     * @method Show\Field|Collection administrator_id(string $label = null)
      * @method Show\Field|Collection amount(string $label = null)
      * @method Show\Field|Collection limit(string $label = null)
      * @method Show\Field|Collection sent(string $label = null)
@@ -433,6 +508,34 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection payload(string $label = null)
      * @method Show\Field|Collection queue(string $label = null)
      * @method Show\Field|Collection uuid(string $label = null)
+     * @method Show\Field|Collection after_sale_deadline(string $label = null)
+     * @method Show\Field|Collection discount_amount(string $label = null)
+     * @method Show\Field|Collection is_comment(string $label = null)
+     * @method Show\Field|Collection order_id(string $label = null)
+     * @method Show\Field|Collection quantity(string $label = null)
+     * @method Show\Field|Collection reduced_amount(string $label = null)
+     * @method Show\Field|Collection sell_price(string $label = null)
+     * @method Show\Field|Collection sku_id(string $label = null)
+     * @method Show\Field|Collection specs(string $label = null)
+     * @method Show\Field|Collection spu_id(string $label = null)
+     * @method Show\Field|Collection total_amount(string $label = null)
+     * @method Show\Field|Collection vip_amount(string $label = null)
+     * @method Show\Field|Collection vip_price(string $label = null)
+     * @method Show\Field|Collection weight(string $label = null)
+     * @method Show\Field|Collection completed_at(string $label = null)
+     * @method Show\Field|Collection consignee_address(string $label = null)
+     * @method Show\Field|Collection consignee_name(string $label = null)
+     * @method Show\Field|Collection consignee_telephone(string $label = null)
+     * @method Show\Field|Collection consignee_zone(string $label = null)
+     * @method Show\Field|Collection note(string $label = null)
+     * @method Show\Field|Collection pay_at(string $label = null)
+     * @method Show\Field|Collection pay_sn(string $label = null)
+     * @method Show\Field|Collection pay_way(string $label = null)
+     * @method Show\Field|Collection products_total_amount(string $label = null)
+     * @method Show\Field|Collection remark(string $label = null)
+     * @method Show\Field|Collection shipping_fee(string $label = null)
+     * @method Show\Field|Collection sn(string $label = null)
+     * @method Show\Field|Collection user_coupon_id(string $label = null)
      * @method Show\Field|Collection abilities(string $label = null)
      * @method Show\Field|Collection last_used_at(string $label = null)
      * @method Show\Field|Collection token(string $label = null)
@@ -440,12 +543,8 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection tokenable_type(string $label = null)
      * @method Show\Field|Collection remarks(string $label = null)
      * @method Show\Field|Collection gift_sku_id(string $label = null)
-     * @method Show\Field|Collection num(string $label = null)
-     * @method Show\Field|Collection sku_id(string $label = null)
      * @method Show\Field|Collection attrs(string $label = null)
-     * @method Show\Field|Collection specs(string $label = null)
      * @method Show\Field|Collection part_id(string $label = null)
-     * @method Show\Field|Collection spu_id(string $label = null)
      * @method Show\Field|Collection buynote_id(string $label = null)
      * @method Show\Field|Collection cost_price(string $label = null)
      * @method Show\Field|Collection images(string $label = null)
@@ -453,11 +552,9 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection media(string $label = null)
      * @method Show\Field|Collection release_at(string $label = null)
      * @method Show\Field|Collection sales(string $label = null)
-     * @method Show\Field|Collection sell_price(string $label = null)
+     * @method Show\Field|Collection shipping_template_id(string $label = null)
      * @method Show\Field|Collection stock(string $label = null)
      * @method Show\Field|Collection verify_state(string $label = null)
-     * @method Show\Field|Collection vip_price(string $label = null)
-     * @method Show\Field|Collection weight(string $label = null)
      * @method Show\Field|Collection feature_id(string $label = null)
      * @method Show\Field|Collection items(string $label = null)
      * @method Show\Field|Collection product_spu_id(string $label = null)
@@ -465,7 +562,6 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection rule_id(string $label = null)
      * @method Show\Field|Collection info(string $label = null)
      * @method Show\Field|Collection template_id(string $label = null)
-     * @method Show\Field|Collection quantity(string $label = null)
      * @method Show\Field|Collection code(string $label = null)
      * @method Show\Field|Collection expires_at(string $label = null)
      * @method Show\Field|Collection is_use(string $label = null)
diff --git a/resources/lang/zh_CN/coupon-send-log.php b/resources/lang/zh_CN/coupon-send-log.php
new file mode 100644
index 00000000..5ab69c85
--- /dev/null
+++ b/resources/lang/zh_CN/coupon-send-log.php
@@ -0,0 +1,16 @@
+<?php 
+return [
+    'labels' => [
+        'CouponSendLog' => 'CouponSendLog',
+        'coupon-send-log' => 'CouponSendLog',
+    ],
+    'fields' => [
+        'task_id' => '任务名称',
+        'coupon_id' => '优惠券名称',
+        'user_id' => '用户',
+        'num' => '张数',
+        'status' => '状态',
+    ],
+    'options' => [
+    ],
+];
diff --git a/resources/lang/zh_CN/coupon-send-task.php b/resources/lang/zh_CN/coupon-send-task.php
new file mode 100644
index 00000000..aa15253c
--- /dev/null
+++ b/resources/lang/zh_CN/coupon-send-task.php
@@ -0,0 +1,17 @@
+<?php 
+return [
+    'labels' => [
+        'CouponSendTask' => 'CouponSendTask',
+        'coupon-send-task' => 'CouponSendTask',
+    ],
+    'fields' => [
+        'name' => '任务名称',
+        'coupon_id' => '优惠券',
+        'num' => '张数',
+        'administrator_id' => '操作人',
+        'type' => '任务类型',
+        'status' => '任务状态',
+    ],
+    'options' => [
+    ],
+];