From 4d747867944514da4ece3d647ea16c8e76b96808 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=84=E5=B0=98?= <122383162@qq.com>
Date: Tue, 11 Aug 2020 11:30:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=A1=E5=88=B8=E5=88=97=E8=A1=A8=E5=8A=A0?=
 =?UTF-8?q?=E5=88=B8=E7=A0=81=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Controllers/Activity/CouponController.php | 4 ++--
 packages/coupon/src/Action/Init.php                 | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Admin/Controllers/Activity/CouponController.php b/app/Admin/Controllers/Activity/CouponController.php
index 4573fd9..66fec20 100644
--- a/app/Admin/Controllers/Activity/CouponController.php
+++ b/app/Admin/Controllers/Activity/CouponController.php
@@ -25,7 +25,7 @@ class CouponController extends AdminController
             $filter->column(1 / 2, function ($filter) {
                 $filter->equal('status', '状态')->select(ActivityCoupon::STATUS);
                 $filter->between('used_at', '核销时间')->datetime();
-                
+
                 $users = User::whereHas('identity', function ($query) {
                     $query->where('identity_id', 1);
                 })->get()->pluck('nickname', 'id');
@@ -34,7 +34,7 @@ class CouponController extends AdminController
 
             });
             $filter->column(1 / 2, function ($filter) {
-                $filter->like('redemptionCode', '平安券编号');
+                $filter->like('code', '平安券编号');
                 $filter->where(function ($query) {
                     $query->whereHas('activity', function ($query) {
                         $query->whereHas('rule', function ($query) {
diff --git a/packages/coupon/src/Action/Init.php b/packages/coupon/src/Action/Init.php
index ad2a477..26ccb52 100644
--- a/packages/coupon/src/Action/Init.php
+++ b/packages/coupon/src/Action/Init.php
@@ -148,7 +148,7 @@ class Init
     }
 
     /**
-     * Notes: 校验是否已经核销过。3秒内视为同一订单。不能提交订单id 只能这么办
+     * Notes: 校验是否已经核销过
      * @Author: 玄尘
      * @Date  : 2020/8/8 13:43
      */