diff --git a/app/Admin/Controllers/Activity/LogController.php b/app/Admin/Controllers/Activity/LogController.php new file mode 100644 index 0000000..1aa1883 --- /dev/null +++ b/app/Admin/Controllers/Activity/LogController.php @@ -0,0 +1,94 @@ +title; + } + + /** + * Index interface. + * @param Content $content + * @return Content + */ + public function index(Content $content) + { + return $content + ->title($this->title()) + ->description($this->description['index'] ?? trans('admin.list')) + ->body($this->grid()); + } + + protected function grid() + { + $grid = new Grid(new ActivityCouponLog); + + $grid->model()->latest(); + $grid->disableActions(); + $grid->disableCreateButton(); + + $grid->filter(function ($filter) { + $filter->column(1 / 2, function ($filter) { + $filter->equal('code', '卡券编号'); + $filter->equal('type', '分类')->select(ActivityCouponLog::TYPES); + }); + + $filter->column(1 / 2, function ($filter) { + $filter->equal('status', '状态')->select(ActivityCouponLog::STATUS); + + $filter->between('created_at', '开始时间')->datetime(); + }); + + }); + + $grid->column('id', '#ID#'); + $grid->column('code', '卡券编号'); + $grid->column('type', '分类') + ->using(ActivityCouponLog::TYPES) + ->label([ + 1 => 'default', + 2 => 'warning', + 3 => 'info', + ]); + + $grid->column('status', '状态') + ->using(ActivityCouponLog::STATUS) + ->label([ + 1 => 'default', + 2 => 'warning', + 3 => 'info', + ]); + + $grid->column('remark', '处理结果'); + + $grid->column('created_at', '操作时间'); + + return $grid; + } + +} diff --git a/app/Admin/routes.php b/app/Admin/routes.php index b4d973f..9010744 100644 --- a/app/Admin/routes.php +++ b/app/Admin/routes.php @@ -1,57 +1,58 @@ - config('admin.route.prefix'), - 'namespace' => config('admin.route.namespace'), - 'middleware' => config('admin.route.middleware'), -], function (Router $router) { - - $router->get('/', 'HomeController@index')->name('admin.home'); - $router->get('test', 'TestController@index')->name('test.index'); - - $router->post('uploads/editor', 'UploadController@editor')->name('uploads.editor'); - - /** - * 账户管理 - */ - $router->get('accounts', 'Account\IndexController@index'); - $router->get('accounts/logs', 'Account\LogController@index'); - $router->resource('accounts/rules', 'Account\RuleController'); - /** - * 用户管理 - */ - $router->get('user/parent', 'User\IndexController@getParent'); - $router->resource('users', 'User\IndexController'); - - //身份管理 - $router->resource('identity', 'IdentityController'); - - /** - * api 日志 - */ - $router->resource('logs', 'Log\IndexController'); - $router->resource('coupons', 'Coupon\IndexController'); //平安卡券 - $router->resource('wos', 'Wo\IndexController'); //沃钱包业务 - - /** - * 财务管理 - */ - $router->resource('finances', 'Finance\IndexController'); - $router->resource('financelogs', 'Finance\LogController'); - - $router->get('census/today', 'Finance\CensusController@today'); - $router->resource('census', 'Finance\CensusController'); - - //省份地址 - $router->get('ajax/areas/children', 'Ajax\AreaController@children')->name('areas.children'); - - //活动列表 - $router->resource('activities', 'Activity\IndexController'); - $router->resource('rules', 'Activity\RuleController'); - $router->resource('activitycoupons', 'Activity\CouponController'); - -}); + config('admin.route.prefix'), + 'namespace' => config('admin.route.namespace'), + 'middleware' => config('admin.route.middleware'), +], function (Router $router) { + + $router->get('/', 'HomeController@index')->name('admin.home'); + $router->get('test', 'TestController@index')->name('test.index'); + + $router->post('uploads/editor', 'UploadController@editor')->name('uploads.editor'); + + /** + * 账户管理 + */ + $router->get('accounts', 'Account\IndexController@index'); + $router->get('accounts/logs', 'Account\LogController@index'); + $router->resource('accounts/rules', 'Account\RuleController'); + /** + * 用户管理 + */ + $router->get('user/parent', 'User\IndexController@getParent'); + $router->resource('users', 'User\IndexController'); + + //身份管理 + $router->resource('identity', 'IdentityController'); + + /** + * api 日志 + */ + $router->resource('logs', 'Log\IndexController'); + $router->resource('coupons', 'Coupon\IndexController'); //平安卡券 + $router->resource('wos', 'Wo\IndexController'); //沃钱包业务 + + /** + * 财务管理 + */ + $router->resource('finances', 'Finance\IndexController'); + $router->resource('financelogs', 'Finance\LogController'); + + $router->get('census/today', 'Finance\CensusController@today'); + $router->resource('census', 'Finance\CensusController'); + + //省份地址 + $router->get('ajax/areas/children', 'Ajax\AreaController@children')->name('areas.children'); + + //活动列表 + $router->resource('activities', 'Activity\IndexController'); + $router->resource('rules', 'Activity\RuleController'); + $router->resource('activitycoupons', 'Activity\CouponController'); + $router->resource('activitycouponlogs', 'Activity\LogController'); + +}); diff --git a/app/Models/ActivityCouponLog.php b/app/Models/ActivityCouponLog.php index 278d173..09d2201 100644 --- a/app/Models/ActivityCouponLog.php +++ b/app/Models/ActivityCouponLog.php @@ -9,4 +9,18 @@ class ActivityCouponLog extends Model 'source' => 'array', ]; + const TYPE_DESTROY = 'Destroy'; + const TYPE_VERIFICATION = 'Verification'; + const TYPES = [ + self::TYPE_DESTROY => '作废', + self::TYPE_VERIFICATION => '核销', + ]; + + const STATUS_SUCCESS = 1; + const STATUS_ERROR = 0; + const STATUS = [ + self::STATUS_SUCCESS => '成功', + self::STATUS_ERROR => '失败', + ]; + }