diff --git a/app/Admin/Controllers/Activity/IndexController.php b/app/Admin/Controllers/Activity/IndexController.php index 6529fc7..a858086 100644 --- a/app/Admin/Controllers/Activity/IndexController.php +++ b/app/Admin/Controllers/Activity/IndexController.php @@ -32,7 +32,7 @@ class IndexController extends AdminController /** * Index interface. - * @param Content $content + * @param Content $content * @return Content */ public function index(Content $content) @@ -45,8 +45,8 @@ class IndexController extends AdminController /** * Edit interface. - * @param mixed $id - * @param Content $content + * @param mixed $id + * @param Content $content * @return Content */ public function edit($id, Content $content) @@ -59,7 +59,7 @@ class IndexController extends AdminController /** * Create interface. - * @param Content $content + * @param Content $content * @return Content */ public function create(Content $content) @@ -93,6 +93,8 @@ class IndexController extends AdminController $filter->column(1 / 2, function ($filter) { $filter->between('start_at', '开始时间')->datetime(); $filter->between('end_at', '结束时间')->datetime(); + $filter->equal('channel', '核销途径')->select(Activity::CHANNELS); + }); }); @@ -107,6 +109,13 @@ class IndexController extends AdminController return $this->type_text; }); + $grid->column('channel', '核销途径') + ->using(Activity::CHANNELS) + ->label([ + Activity::CHANNEL_YSD => 'info', + Activity::CHANNEL_UNION => 'success', + ]); + $grid->column('days', '延期(天)'); $grid->column('rule.full', '满足金额'); $grid->column('rule.take', '扣除金额'); @@ -173,6 +182,12 @@ class IndexController extends AdminController }) ->required(); + $form->radio('channel', '核销途径') + ->options(Activity::CHANNELS) + ->default(Activity::CHANNEL_YSD) + ->help('券码核销的途径:亿时代是自己核销,银联是银联pos核销') + ->required(); + $form->switch('status', '状态')->default(1); $form->switch('need_check', '多次校验') ->default(1) diff --git a/app/Models/Activity.php b/app/Models/Activity.php index a24584c..d7eca96 100644 --- a/app/Models/Activity.php +++ b/app/Models/Activity.php @@ -10,6 +10,11 @@ class Activity extends Model use BelongsToUser; + protected $dates = [ + 'start_at', + 'end_at', + ]; + const TYPE_EXTEND = 1; const TYPE_SCOPE = 2; const TYPES = [ @@ -24,9 +29,11 @@ class Activity extends Model self::STATUS_CLOSE => '关闭', ]; - protected $dates = [ - 'start_at', - 'end_at', + const CHANNEL_YSD = 1; + const CHANNEL_UNION = 2; + const CHANNELS = [ + self::CHANNEL_YSD => '亿时代', + self::CHANNEL_UNION => '银联', ]; /** @@ -51,7 +58,7 @@ class Activity extends Model } //活动状态 - public function getStatusTextAttribute() + public function getStatusTextAttribute(): string { return self::STATUS[$this->status] ?? '未知'; } @@ -100,8 +107,13 @@ class Activity extends Model { try { - // $code = 'YSD' . date('ymd') . mt_rand(100000, 999999); - $code = '66406' . date('ymdH') . mt_rand(1000000, 9999999); + //判断生成何种码 + if ($this->channel == self::CHANNEL_UNION) { + $code = '66406' . date('ymdH') . mt_rand(1000000, 9999999); + } else { + $code = 'YSD' . date('ymd') . mt_rand(100000, 999999); + } + if ($this->type == SELF::TYPE_EXTEND) { $start_at = now(); $end_at = now()->addDays($this->days);