diff --git a/app/Admin/Controllers/Activity/CouponController.php b/app/Admin/Controllers/Activity/CouponController.php index 66fec20..1424027 100644 --- a/app/Admin/Controllers/Activity/CouponController.php +++ b/app/Admin/Controllers/Activity/CouponController.php @@ -66,6 +66,19 @@ class CouponController extends AdminController $grid->column('used_at', '核销时间'); $grid->column('created_at', '创建时间'); + $grid->disableExport(false); + + $grid->export(function ($export) { + $export->column('status', function ($value, $original) { + return strip_tags($value); + }); + $export->column('mobile', function ($value, $original) { + return $value . "\t"; + }); + + $export->filename($this->title . date("YmdHis")); + }); + return $grid; } diff --git a/app/Channels/WeChatChannel.php b/app/Channels/WeChatChannel.php deleted file mode 100644 index 9bd9bfc..0000000 --- a/app/Channels/WeChatChannel.php +++ /dev/null @@ -1,19 +0,0 @@ -toWeChat($notifiable); - } -} diff --git a/app/Http/Controllers/TestController.php b/app/Http/Controllers/TestController.php index dbe0d8b..d214c35 100644 --- a/app/Http/Controllers/TestController.php +++ b/app/Http/Controllers/TestController.php @@ -151,9 +151,11 @@ class TestController $res = Coupon::Redemption($this->user, $redemptionCode, $total, $outletId); - dump($this->getElapsedTime()); - dump($this->getMemoryUsage()); - dd($res); + if (is_string($res)) { + return $this->error($res); + } + + return $this->success('核销成功'); } public function http($data, $url)