From 3dfd677017e32532bc2ac49dbafea216b332de5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=84=E5=B0=98?= <122383162@qq.com>
Date: Thu, 20 Aug 2020 17:01:01 +0800
Subject: [PATCH] =?UTF-8?q?'=E4=BF=AE=E6=94=B9=E6=B4=BB=E5=8A=A8+=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E6=8E=A5=E5=8F=A3'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/Activity/CouponController.php | 13 +++++++++++++
 app/Channels/WeChatChannel.php                | 19 -------------------
 app/Http/Controllers/TestController.php       |  8 +++++---
 3 files changed, 18 insertions(+), 22 deletions(-)
 delete mode 100644 app/Channels/WeChatChannel.php

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 @@
-<?php
-
-namespace App\Channels;
-
-use Illuminate\Notifications\Notification;
-
-class VoiceChannel
-{
-    /**
-     * 发送指定的通知.
-     * @param  mixed  $notifiable
-     * @param  \Illuminate\Notifications\Notification  $notification
-     * @return void
-     */
-    public function send($notifiable, Notification $notification)
-    {
-        $message = $notification->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)