调整接口

.gitignore

@@ -1,6 +1,10 @@
-/tests/
+/tests/
-/.idea/
+/.idea/
-.editorconfig
+.editorconfig
-.env
+.env
-/vendor
+/vendor
-/storage/
+/storage/app
+/storage/logs
+/storage/framework
+/storage/debugbar/
+/bootstrap/cache

README

@@ -1,2 +0,0 @@
-核销系统 增加发券  开发分支
-

README.md

@@ -0,0 +1,9 @@
+# 核销接口
+
+[TOC]
+
+## 文档说明
+
+| 版本号 | 发行说明           |
+| ------ | ------------------ |
+| 1.0.1  | 第一版本发布       |

app/Admin/Controllers/Activity/IndexController.php

@@ -1,247 +1,267 @@
-<?php
+<?php
-
+
-namespace App\Admin\Controllers\Activity;
+namespace App\Admin\Controllers\Activity;
-
+
-use App\Admin\Renderable\Activity\Grants;
+use App\Admin\Renderable\Activity\Grants;
-use App\Models\Activity;
+use App\Models\Activity;
-use App\Models\ActivityGrant;
+use App\Models\ActivityGrant;
-use App\Models\ActivityRule;
+use App\Models\ActivityRule;
-use App\Models\User;
+use App\Models\User;
-use Encore\Admin\Controllers\HasResourceActions;
+use Encore\Admin\Controllers\HasResourceActions;
-use Encore\Admin\Form;
+use Encore\Admin\Form;
-use Encore\Admin\Grid;
+use Encore\Admin\Grid;
-use Encore\Admin\Layout\Content;
+use Encore\Admin\Layout\Content;
-use Illuminate\Support\MessageBag;
+use Illuminate\Support\MessageBag;
-use Illuminate\Routing\Controller as AdminController;
+use Illuminate\Routing\Controller as AdminController;
-
+
-class IndexController extends AdminController
+class IndexController extends AdminController
-{
+{
-
+
-    use HasResourceActions;
+    use HasResourceActions;
-
+
-    protected $title = '活动管理';
+    protected $title = '活动管理';
-
+
-    /**
+    /**
-     * Get content title.
+     * Get content title.
-     * @return string
+     * @return string
-     */
+     */
-    protected function title()
+    protected function title()
-    {
+    {
-        return $this->title;
+        return $this->title;
-    }
+    }
-
+
-    /**
+    /**
-     * Index interface.
+     * Index interface.
-     * @param Content $content
+     * @param Content $content
-     * @return Content
+     * @return Content
-     */
+     */
-    public function index(Content $content)
+    public function index(Content $content)
-    {
+    {
-        return $content
+        return $content
-            ->title($this->title())
+            ->title($this->title())
-            ->description($this->description['index'] ?? trans('admin.list'))
+            ->description($this->description['index'] ?? trans('admin.list'))
-            ->body($this->grid());
+            ->body($this->grid());
-    }
+    }
-
+
-    /**
+    /**
-     * Edit interface.
+     * Edit interface.
-     * @param mixed   $id
+     * @param mixed   $id
-     * @param Content $content
+     * @param Content $content
-     * @return Content
+     * @return Content
-     */
+     */
-    public function edit($id, Content $content)
+    public function edit($id, Content $content)
-    {
+    {
-        return $content
+        return $content
-            ->title($this->title())
+            ->title($this->title())
-            ->description($this->description['edit'] ?? trans('admin.edit'))
+            ->description($this->description['edit'] ?? trans('admin.edit'))
-            ->body($this->form($id)->edit($id));
+            ->body($this->form($id)->edit($id));
-    }
+    }
-
+
-    /**
+    /**
-     * Create interface.
+     * Create interface.
-     * @param Content $content
+     * @param Content $content
-     * @return Content
+     * @return Content
-     */
+     */
-    public function create(Content $content)
+    public function create(Content $content)
-    {
+    {
-        return $content
+        return $content
-            ->title($this->title())
+            ->title($this->title())
-            ->description($this->description['create'] ?? trans('admin.create'))
+            ->description($this->description['create'] ?? trans('admin.create'))
-            ->body($this->form());
+            ->body($this->form());
-    }
+    }
-
+
-    protected function grid()
+    protected function grid()
-    {
+    {
-        $grid = new Grid(new Activity);
+        $grid = new Grid(new Activity);
-        $grid->model()->with(['grants.user', 'verifications.user']);
+        $grid->model()->withCount('coupons');
-        $grid->actions(function ($actions) {
+
-            $actions->disableView();
+        $grid->actions(function ($actions) {
-        });
+            $actions->disableView();
-
+        });
-        $grid->filter(function ($filter) {
+
-            $filter->column(1 / 2, function ($filter) {
+        $grid->filter(function ($filter) {
-                $filter->equal('status', '状态')->select(Activity::STATUS);
+            $filter->column(1 / 2, function ($filter) {
-                $filter->equal('type', '类型')->select(Activity::TYPES);
+                $filter->equal('status', '状态')->select(Activity::STATUS);
-
+                $filter->equal('type', '类型')->select(Activity::TYPES);
-                $users = User::whereHas('identity', function ($query) {
+
-                    $query->where('identity_id', 1);
+                $users = User::whereHas('identity', function ($query) {
-                })->get()->pluck('nickname', 'id');
+                    $query->where('identity_id', 1);
-
+                })->get()->pluck('nickname', 'id');
-            });
+
-
+            });
-            $filter->column(1 / 2, function ($filter) {
+
-                $filter->between('start_at', '开始时间')->datetime();
+            $filter->column(1 / 2, function ($filter) {
-                $filter->between('end_at', '结束时间')->datetime();
+                $filter->between('start_at', '开始时间')->datetime();
-            });
+                $filter->between('end_at', '结束时间')->datetime();
-
+            });
-        });
+
-
+        });
-        $grid->column('id', '#ID#');
+
-        $grid->column('title', '活动名称');
+        $grid->column('id', '#ID#');
-        $grid->column('code', '活动编号');
+        $grid->column('title', '活动名称');
-        $grid->column('rule.code', '卡券规则');
+        $grid->column('code', '活动编号');
-        $grid->column('类型')->display(function () {
+        $grid->column('total', '可发券总数');
-            return $this->type_text;
+        $grid->column('coupons_count', '可发券总数');
-        });
+        $grid->column('rule.code', '卡券规则');
-
+        $grid->column('类型')->display(function () {
-        $grid->column('days', '延期(天)');
+            return $this->type_text;
-        $grid->column('rule.full', '满足金额');
+        });
-        $grid->column('rule.take', '扣除金额');
+
-        $grid->column('发券')
+        $grid->column('days', '延期(天)');
-             ->display(function () {
+        $grid->column('rule.full', '满足金额');
-                 return $this->grants->pluck('user_nickname');
+        $grid->column('rule.take', '扣除金额');
-             })
+        $grid->column('发券')
-             ->label()
+             ->display(function () {
-             ->hide();
+                 return $this->grants->pluck('user_nickname');
-
+             })
-        $grid->column('核券')
+             ->label()
-             ->display(function () {
+             ->hide();
-                 return $this->verifications->pluck('user_nickname');
+
-             })
+        $grid->column('核券')
-             ->label()
+             ->display(function () {
-             ->hide();
+                 return $this->verifications->pluck('user_nickname');
-
+             })
-        $grid->column('开始时间')->display(function () {
+             ->label()
-            return $this->type == Activity::TYPE_SCOPE ? $this->start_at->format('Y-m-d') : '---';
+             ->hide();
-        });
+
-        $grid->column('结束时间')->display(function () {
+        $grid->column('开始时间')->display(function () {
-            return $this->type == Activity::TYPE_SCOPE ? $this->end_at->format('Y-m-d') : '---';
+            return $this->type == Activity::TYPE_SCOPE ? $this->start_at->format('Y-m-d') : '---';
-        });
+        });
-
+        $grid->column('结束时间')->display(function () {
-        $grid->status('状态')->switch([
+            return $this->type == Activity::TYPE_SCOPE ? $this->end_at->format('Y-m-d') : '---';
-            'on'  => ['value' => 1, 'text' => '正常', 'color' => 'primary'],
+        });
-            'off' => ['value' => 0, 'text' => '关闭', 'color' => 'danger'],
+
-        ]);
+        $grid->status('状态')->switch([
-
+            'on'  => ['value' => 1, 'text' => '正常', 'color' => 'primary'],
-        $grid->column('created_at', '创建时间');
+            'off' => ['value' => 0, 'text' => '关闭', 'color' => 'danger'],
-
+        ]);
-        return $grid;
+
-    }
+        $grid->column('created_at', '创建时间');
-
+
-    /**
+        return $grid;
-     * Make a form builder.
+    }
-     * @return Form
+
-     */
+    /**
-    protected function form($id = '')
+     * Make a form builder.
-    {
+     * @return Form
-        $form = new Form(new Activity);
+     */
-
+    protected function form($id = '')
-        $form->text('title', '活动名称')->required();
+    {
-        $form->textarea('description', '活动说明')->required();
+        $form = new Form(new Activity);
-
+
-        $form->select('activity_rule_id', '所属规则')
+        $form->text('title', '活动名称')->required();
-             ->options(function ($option, $info) {
+        $form->textarea('description', '活动说明')->required();
-                 return ActivityRule::where('status', 1)->pluck('title', 'id');
+
-             })
+        $form->select('activity_rule_id', '所属规则')
-             ->required();
+             ->options(function ($option, $info) {
-
+                 return ActivityRule::where('status', 1)->pluck('title', 'id');
-        $form->radio('type', '类型')
+             })
-             ->options(Activity::TYPES)
+             ->required();
-             ->when(Activity::TYPE_EXTEND, function (Form $form) {
+
-                 $form->number('days', '延期天数')->default(60)->help('到期日期=发券日期+延期天数');
+        $form->number('total', '总数')
-             })
+             ->help('可发券总数')
-             ->when(Activity::TYPE_SCOPE, function (Form $form) {
+             ->default(10000)
-                 $form->dateRange('start_at', 'end_at', '有效时间');
+             ->required();
-             })
+
-             ->required();
+        $form->radio('type', '类型')
-
+             ->options(Activity::TYPES)
-        $form->switch('status', '状态')->default(1);
+             ->when(Activity::TYPE_EXTEND, function (Form $form) {
-        $form->switch('need_check', '多次校验')
+                 $form->number('days', '延期天数')->default(60)->help('到期日期=发券日期+延期天数');
-             ->default(1)
+             })
-             ->help('同一订单，多次核销时校验，订单每满100元可核销一笔。');
+             ->when(Activity::TYPE_SCOPE, function (Form $form) {
-
+                 $form->dateRange('start_at', 'end_at', '有效时间');
-        $grantdef = $verificationsdef = '';
+             })
-        if ($id) {
+             ->required();
-            $grantdef         = Activity::find($id)->grants()->pluck('user_id')->toArray();
+
-            $verificationsdef = Activity::find($id)->verifications()->pluck('user_id')->toArray();
+        $form->switch('status', '状态')->default(1);
-        }
+        $form->switch('need_check', '多次校验')
-
+             ->default(1)
-        $users = User::with('info')->whereHas('identity', function ($q) {
+             ->help('同一订单，多次核销时校验，订单每满100元可核销一笔。');
-            $q->where('identity_id', 1);
+
-        })->orderBy('id', 'desc')->get()->pluck('nickname', 'id');
+        $grantdef = $verificationsdef = '';
-
+        if ($id) {
-        $form->listbox('grants.user_id', '可发券渠道')
+            $grantdef         = Activity::find($id)->grants()->pluck('user_id')->toArray();
-             ->options($users)
+            $verificationsdef = Activity::find($id)->verifications()->pluck('user_id')->toArray();
-             ->default($grantdef)
+        }
-             ->required();
+
-
+        $users = User::with('info')->whereHas('identity', function ($q) {
-        $form->listbox('verifications.user_id', '可核券渠道')
+            $q->where('identity_id', 1);
-             ->options($users)
+        })->orderBy('id', 'desc')->get()->pluck('nickname', 'id');
-             ->default($verificationsdef)
+
-             ->required();
+        $form->listbox('grants.user_id', '可发券渠道')
-
+             ->options($users)
-        $form->saving(function (Form $form) {
+             ->default($grantdef)
-            $request = request();
+             ->required();
-            if ($request->type == Activity::TYPE_EXTEND && empty($request->days)) {
+
-                $error = new MessageBag([
+        $form->listbox('verifications.user_id', '可核券渠道')
-                    'title'   => '错误',
+             ->options($users)
-                    'message' => '必须添加延期天数',
+             ->default($verificationsdef)
-                ]);
+             ->required();
-
+
-                return back()->withInput()->with(compact('error'));
+        $form->saving(function (Form $form) {
-            }
+            $request = request();
-
+
-            if ($request->type == Activity::TYPE_SCOPE && (empty($request->start_at) || empty($request->end_at))) {
+            if ($request->total < 0) {
-                $error = new MessageBag([
+                $error = new MessageBag([
-                    'title'   => '错误',
+                    'title'   => '错误',
-                    'message' => '必须添加延期天数',
+                    'message' => '可发券总数必须大于0',
-                ]);
+                ]);
-
+
-                return back()->withInput()->with(compact('error'));
+                return back()->withInput()->with(compact('error'));
-            }
+            }
-            if (request()->start) {
+
-                $form->start_at = $form->start_at . ' 00:00:01';
+            if ($request->type == Activity::TYPE_EXTEND && empty($request->days)) {
-            }
+                $error = new MessageBag([
-
+                    'title'   => '错误',
-            if (request()->end_at) {
+                    'message' => '必须添加延期天数',
-                $form->end_at = $form->end_at . ' 23:59:59';
+                ]);
-            }
+
-        });
+                return back()->withInput()->with(compact('error'));
-
+            }
-        $form->saved(function (Form $form) {
+
-            $users = [];
+            if ($request->type == Activity::TYPE_SCOPE && (empty($request->start_at) || empty($request->end_at))) {
-            foreach ($form->grants['user_id'] as $key => $user_id) {
+                $error = new MessageBag([
-                if ($user_id) {
+                    'title'   => '错误',
-                    $form->model()->grants()->updateOrCreate([
+                    'message' => '必须添加延期天数',
-                        'user_id' => $user_id,
+                ]);
-                    ]);
+
-                    $users[] = $user_id;
+                return back()->withInput()->with(compact('error'));
-                }
+            }
-            }
+
-            $form->model()->grants()->whereNotIn('user_id', $users)->delete();
+            if (request()->start) {
-            $users = [];
+                $form->start_at = $form->start_at . ' 00:00:01';
-            foreach ($form->verifications['user_id'] as $key => $user_id) {
+            }
-                if ($user_id) {
+
-                    $form->model()->verifications()->updateOrCreate([
+            if (request()->end_at) {
-                        'user_id' => $user_id,
+                $form->end_at = $form->end_at . ' 23:59:59';
-                    ]);
+            }
-                    $users[] = $user_id;
+
-                }
+        });
-            }
+
-            $form->model()->verifications()->whereNotIn('user_id', $users)->delete();
+        $form->saved(function (Form $form) {
-        });
+            $users = [];
-
+            foreach ($form->grants['user_id'] as $key => $user_id) {
-        return $form;
+                if ($user_id) {
-    }
+                    $form->model()->grants()->updateOrCreate([
-
+                        'user_id' => $user_id,
-}
+                    ]);
+                    $users[] = $user_id;
+                }
+            }
+            $form->model()->grants()->whereNotIn('user_id', $users)->delete();
+            $users = [];
+            foreach ($form->verifications['user_id'] as $key => $user_id) {
+                if ($user_id) {
+                    $form->model()->verifications()->updateOrCreate([
+                        'user_id' => $user_id,
+                    ]);
+                    $users[] = $user_id;
+                }
+            }
+            $form->model()->verifications()->whereNotIn('user_id', $users)->delete();
+        });
+
+        return $form;
+    }
+
+}

app/Api/Controllers/IndexController.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Api\Controllers;
+
+class IndexController extends Controller
+{
+
+    public function index()
+    {
+        return $this->respond('200', [
+            'code'    => 200,
+            'message' => 'Json Api is ready',
+        ]);
+    }
+
+}

app/Api/routes.php

@@ -1,6 +1,8 @@
 <?php
 
 Route::group(['prefix' => 'V1'], function () {
+    Route::get('/', 'IndexController@index');
+
     Route::post('user/get', 'UserController@index');
     Route::post('user/check', 'UserController@check');
 
@@ -22,5 +24,4 @@ Route::group(['prefix' => 'V1'], function () {
     Route::post('unionpay/index', 'UnionPayController@index');
     Route::post('unionpay/query', 'UnionPayController@query');
 
-
 });

app/Http/Controllers/TestController.php

@@ -17,20 +17,36 @@ class TestController
 
     public function index(Request $request)
     {
-        $user_id = $request->user_id;
+        $this->user = User::find(6);
-        $data = $request->data;
+        $ret        = [
+            'redemptionCode' => 'YSD201029312435',
+            'outletId'       => '2008030929274',
+        ];
+
+        $ret = [
+            'mobile'     => '15663876870',
+            'orderid'    => '202008105236478',
+            'activityId' => 'ysd202010272',
+            'outletId'   => '2008241014458',
+
+        ];
+
+        return $this->success($ret);
+        dd();
+        $user_id    = $request->user_id;
+        $data       = $request->data;
         $this->user = User::find(3);
 
         $data = '5VehIrHTZsS1BY8V5VcKlhTN9hbutq4j+HIT2zRCbSqgPWvClQSxYSP7mn7PmHuiYQpj55NRC6w4397FfdVTq23wd4BOQ964giie/JForTjt0l7UaY23XzKnNjDSKiGqr7DAbd8P3SzJ75ZjKaqUu7UWu3PVylAeesGRbZgpQEF/XKwOW4XMaJGV2tIsowILZCtF+moqHg7yA6hI4vT7iYU3rTq9vk7kpcnfArLKPQ5dxH9FFIegdr7E1S8NVwpTZrxeQEmjDUsGrBcWe/Q9dRWXSlKF1Hdz2qCUCK94fu3gqvEVSYRllTCa5mwQhlYJLs2UTmWMSism7nsivySseSl1/JOvNH0lyvWaV1XDUMKG8oTC+kOPQKxFA3qp2xO9ohRhN0dkpML4JVgkMF1r6rv+rThYQuOL/rnsuY5Jdh4QdPWCItQ05lqI46s2yPyKROrLx7jQ3/+BOyEmP+Cj5W8/trEAVS1HczMj4Jnl3vrcY879ubokUcEatalAuKGM0uLNAqQF5XfHzgXam4coEMek8MjdbxW+Z9+eZFQp/P1ts7yN5qzpac6Y8CrqSMFJZf1vwowp+1peiEC5tCsXlHCsDLPS8Uh1LNnC3sag0XZu7jX5uVR9nxR2c/ibBJOAHcUO+NcjmzoN+dQOeBkb/aWj9B+9mW5RUQmfUk6O+Vwkb5ruZZbXsoJJULj4tHJv87+mVo30e0mBbaPD47+fTp1+qSJtLOOlLO2nEj1NNDBSBGLM4RxTDQ4ju2r6HY9YyMXsbNC2YB8zrXrDsUoB1WSuu5XcaWx8rzA0NpckzNbEIuv0+6fA69gXOhC9xcGGPyEBbko73XHr7W8MIDtWhGOG8kHf1cAMdjwVGS2OUJ6XKZnBMwIzY8cJn4Fi+jXRMFnt+7BxWLToNQsyOoHbYWypeM8FrAb4VQeaxGhBQUXUmHhmAp00jcGEe/ngxn1oVjq6G+pEq8CxBntvQ+GZ975sPaCqkYOjbuHa9Myd2tT6GWbczL/YcR4RRV96ByYYCEOBy01LsBNeo6SSpWYcK4eoLhc70v8s';
-        $iv = substr($this->user->des3key, 0, 8);
+        $iv   = substr($this->user->des3key, 0, 8);
-        $ret = openssl_decrypt($data, 'DES-EDE3-CBC', $this->user->des3key, 0, $iv);
+        $ret  = openssl_decrypt($data, 'DES-EDE3-CBC', $this->user->des3key, 0, $iv);
         if (false === $ret) {
             return openssl_error_string();
         }
         dd($ret);
         dd();
         $this->user = User::find(215);
-        $ret = [
+        $ret        = [
             'redemptionCode' => '951951858070',
             'total'          => 5,
             'outletId'       => '2006151433887',
@@ -74,7 +90,7 @@ class TestController
      */
     public function grant(Request $request)
     {
-        $this->user = User::find(3);
+        $this->user = User::find(299);
 
         $data = $this->jiami($request->all());
 
@@ -95,7 +111,7 @@ class TestController
         $this->user = User::find(3);
 
         $redemptionCode = $request->redemptionCode;
-        $outletId = $request->outletId;
+        $outletId       = $request->outletId;
 
         $data = $this->jiami($request->all());
 
@@ -121,7 +137,7 @@ class TestController
         $this->user = User::find(3);
 
         $redemptionCode = $request->redemptionCode;
-        $data = $this->jiami($request->all());
+        $data           = $this->jiami($request->all());
 
         $url = $this->baseUrl . 'user/destroy';
         $res = $this->http($data, $url);
@@ -148,11 +164,11 @@ class TestController
         $this->user = User::find($user_id);
 
         $data = $this->jiami([
-                                 'redemptionCode' => $request->redemptionCode,
+            'redemptionCode' => $request->redemptionCode,
-                                 'total'          => $request->total,
+            'total'          => $request->total,
-                                 'outletId'       => $request->outletId,
+            'outletId'       => $request->outletId,
-                                 'orderid'        => $request->orderid,
+            'orderid'        => $request->orderid,
-                             ]);
+        ]);
 
         $url = $this->baseUrl . 'user/freezecoupon';
         $res = $this->http($data, $url);
@@ -160,10 +176,10 @@ class TestController
         return $res;
 
         $redemptionCode = $request->redemptionCode;
-        $total = $request->total;
+        $total          = $request->total;
-        $outletId = $request->outletId;
+        $outletId       = $request->outletId;
-        $orderid = $request->orderid ?? '';
+        $orderid        = $request->orderid ?? '';
-        $res = Coupon::Redemption($this->user, $redemptionCode, $total, $outletId, $orderid);
+        $res            = Coupon::Redemption($this->user, $redemptionCode, $total, $outletId, $orderid);
 
         if (is_string($res)) {
             return $this->error($res);
@@ -174,22 +190,22 @@ class TestController
 
     public function http($data, $url)
     {
-        $client = new Client();
+        $client   = new Client();
         $response = $client->request('POST', $url, ['form_params' => $data, 'http_errors' => false]);
 
-        $body = $response->getBody();
+        $body    = $response->getBody();
         $content = $body->getContents();
-        $result = json_decode($content, true);
+        $result  = json_decode($content, true);
 
         return $result;
     }
 
     public function jiami($ret)
     {
-        $jsonData = json_encode($ret); //数据JSON化
+        $jsonData = json_encode($ret);                     //数据JSON化
-        $ascdata = $this->keyasc($jsonData); //加密
+        $ascdata  = $this->keyasc($jsonData);              //加密
-        $addcode = sprintf("%08d", mt_rand(0, 99999999)); //随机code 验证签名用
+        $addcode  = sprintf("%08d", mt_rand(0, 99999999)); //随机code 验证签名用
-        $sign = $this->keysign($ascdata, $addcode);
+        $sign     = $this->keysign($ascdata, $addcode);
 
         $data = [
             'server_id' => $this->user->server_id,
@@ -209,7 +225,7 @@ class TestController
      */
     public function jiemi($value)
     {
-        $iv = substr($this->user->des3key, 0, 8);
+        $iv  = substr($this->user->des3key, 0, 8);
         $ret = openssl_decrypt($value, 'DES - EDE3 - CBC', $this->user->des3key, 0, $iv);
         if (false === $ret) {
             return openssl_error_string();

app/Models/Activity.php

@@ -98,9 +98,10 @@ class Activity extends Model
     //发券
     public function grant($mobile, $outletId = null)
     {
-        try {
-            $code = '66406' . date('ymd') . mt_rand(100000, 999999);
 
+        try {
+            //            $code = 'YSD' . date('ymd') . mt_rand(100000, 999999);
+            $code = '66406' . date('ymdH') . mt_rand(1000000, 9999999);
             if ($this->type == SELF::TYPE_EXTEND) {
                 $start_at = now();
                 $end_at   = now()->addDays($this->days);

bootstrap/cache/packages.php

@@ -1,13 +1,13 @@
 <?php return array (
-  'aslong/sms' => 
+  'barryvdh/laravel-debugbar' => 
   array (
     'providers' => 
     array (
-      0 => 'AsLong\\Sms\\ServiceProvider',
+      0 => 'Barryvdh\\Debugbar\\ServiceProvider',
     ),
     'aliases' => 
     array (
-      'Sms' => 'AsLong\\Sms\\Facades\\Sms',
+      'Debugbar' => 'Barryvdh\\Debugbar\\Facade',
     ),
   ),
   'encore/laravel-admin' => 
@@ -21,17 +21,6 @@
       'Admin' => 'Encore\\Admin\\Facades\\Admin',
     ),
   ),
-  'facade/ignition' => 
-  array (
-    'providers' => 
-    array (
-      0 => 'Facade\\Ignition\\IgnitionServiceProvider',
-    ),
-    'aliases' => 
-    array (
-      'Flare' => 'Facade\\Ignition\\Facades\\Flare',
-    ),
-  ),
   'fideloper/proxy' => 
   array (
     'providers' => 
@@ -82,24 +71,6 @@
       0 => 'Carbon\\Laravel\\ServiceProvider',
     ),
   ),
-  'nunomaduro/collision' => 
-  array (
-    'providers' => 
-    array (
-      0 => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider',
-    ),
-  ),
-  'overtrue/laravel-wechat' => 
-  array (
-    'providers' => 
-    array (
-      0 => 'Overtrue\\LaravelWeChat\\ServiceProvider',
-    ),
-    'aliases' => 
-    array (
-      'EasyWeChat' => 'Overtrue\\LaravelWeChat\\Facade',
-    ),
-  ),
   'simplesoftwareio/simple-qrcode' => 
   array (
     'providers' => 

bootstrap/cache/services.php

@@ -23,24 +23,21 @@
     19 => 'Illuminate\\Translation\\TranslationServiceProvider',
     20 => 'Illuminate\\Validation\\ValidationServiceProvider',
     21 => 'Illuminate\\View\\ViewServiceProvider',
-    22 => 'AsLong\\Sms\\ServiceProvider',
+    22 => 'Barryvdh\\Debugbar\\ServiceProvider',
     23 => 'Encore\\Admin\\AdminServiceProvider',
-    24 => 'Facade\\Ignition\\IgnitionServiceProvider',
+    24 => 'Fideloper\\Proxy\\TrustedProxyServiceProvider',
-    25 => 'Fideloper\\Proxy\\TrustedProxyServiceProvider',
+    25 => 'Intervention\\Image\\ImageServiceProvider',
-    26 => 'Intervention\\Image\\ImageServiceProvider',
+    26 => 'Encore\\WangEditor\\WangEditorServiceProvider',
-    27 => 'Encore\\WangEditor\\WangEditorServiceProvider',
+    27 => 'Laravel\\Tinker\\TinkerServiceProvider',
-    28 => 'Laravel\\Tinker\\TinkerServiceProvider',
+    28 => 'Maatwebsite\\Excel\\ExcelServiceProvider',
-    29 => 'Maatwebsite\\Excel\\ExcelServiceProvider',
+    29 => 'Carbon\\Laravel\\ServiceProvider',
-    30 => 'Carbon\\Laravel\\ServiceProvider',
+    30 => 'SimpleSoftwareIO\\QrCode\\QrCodeServiceProvider',
-    31 => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider',
+    31 => 'App\\Providers\\AppServiceProvider',
-    32 => 'Overtrue\\LaravelWeChat\\ServiceProvider',
+    32 => 'App\\Providers\\AuthServiceProvider',
-    33 => 'SimpleSoftwareIO\\QrCode\\QrCodeServiceProvider',
+    33 => 'App\\Providers\\EventServiceProvider',
-    34 => 'App\\Providers\\AppServiceProvider',
+    34 => 'App\\Providers\\RouteServiceProvider',
-    35 => 'App\\Providers\\AuthServiceProvider',
+    35 => 'App\\Api\\ApiServiceProvider',
-    36 => 'App\\Providers\\EventServiceProvider',
+    36 => 'App\\Merchant\\MerchantServiceProvider',
-    37 => 'App\\Providers\\RouteServiceProvider',
-    38 => 'App\\Api\\ApiServiceProvider',
-    39 => 'App\\Merchant\\MerchantServiceProvider',
   ),
   'eager' => 
   array (
@@ -54,24 +51,21 @@
     7 => 'Illuminate\\Pagination\\PaginationServiceProvider',
     8 => 'Illuminate\\Session\\SessionServiceProvider',
     9 => 'Illuminate\\View\\ViewServiceProvider',
-    10 => 'AsLong\\Sms\\ServiceProvider',
+    10 => 'Barryvdh\\Debugbar\\ServiceProvider',
     11 => 'Encore\\Admin\\AdminServiceProvider',
-    12 => 'Facade\\Ignition\\IgnitionServiceProvider',
+    12 => 'Fideloper\\Proxy\\TrustedProxyServiceProvider',
-    13 => 'Fideloper\\Proxy\\TrustedProxyServiceProvider',
+    13 => 'Intervention\\Image\\ImageServiceProvider',
-    14 => 'Intervention\\Image\\ImageServiceProvider',
+    14 => 'Encore\\WangEditor\\WangEditorServiceProvider',
-    15 => 'Encore\\WangEditor\\WangEditorServiceProvider',
+    15 => 'Laravel\\Tinker\\TinkerServiceProvider',
-    16 => 'Laravel\\Tinker\\TinkerServiceProvider',
+    16 => 'Maatwebsite\\Excel\\ExcelServiceProvider',
-    17 => 'Maatwebsite\\Excel\\ExcelServiceProvider',
+    17 => 'Carbon\\Laravel\\ServiceProvider',
-    18 => 'Carbon\\Laravel\\ServiceProvider',
+    18 => 'SimpleSoftwareIO\\QrCode\\QrCodeServiceProvider',
-    19 => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider',
+    19 => 'App\\Providers\\AppServiceProvider',
-    20 => 'Overtrue\\LaravelWeChat\\ServiceProvider',
+    20 => 'App\\Providers\\AuthServiceProvider',
-    21 => 'SimpleSoftwareIO\\QrCode\\QrCodeServiceProvider',
+    21 => 'App\\Providers\\EventServiceProvider',
-    22 => 'App\\Providers\\AppServiceProvider',
+    22 => 'App\\Providers\\RouteServiceProvider',
-    23 => 'App\\Providers\\AuthServiceProvider',
+    23 => 'App\\Api\\ApiServiceProvider',
-    24 => 'App\\Providers\\EventServiceProvider',
+    24 => 'App\\Merchant\\MerchantServiceProvider',
-    25 => 'App\\Providers\\RouteServiceProvider',
-    26 => 'App\\Api\\ApiServiceProvider',
-    27 => 'App\\Merchant\\MerchantServiceProvider',
   ),
   'deferred' => 
   array (

packages/coupon/src/Action/ysd/YsdGrant.php

@@ -4,6 +4,7 @@ namespace XuanChen\Coupon\Action\ysd;
 
 use App\Models\Activity;
 use App\Models\User;
+use Carbon\Carbon;
 use XuanChen\Coupon\Action\Init;
 
 class YsdGrant extends Init
@@ -13,7 +14,7 @@ class YsdGrant extends Init
     {
         try {
 
-            $activity = Activity::where('code', $this->activityId)->first();
+            $activity = Activity::withCount('coupons')->where('code', $this->activityId)->first();
             if (!$activity) {
                 return '发券失败,没有找到这个活动。';
             }
@@ -21,6 +22,14 @@ class YsdGrant extends Init
             if (!$activity->status) {
                 return '发券失败,活动已经关闭。';
             }
+            
+            if ($activity->type == Activity::TYPE_SCOPE && Carbon::now()->gt($activity->end_at)) {
+                return '发券失败,此活动已经结束。';
+            }
+
+            if ($activity->total > 0 && $activity->coupons_count >= $activity->total) {
+                return '发券失败,已达到可发券总数。';
+            }
 
             $outlet = User::where('outlet_id', $this->outletId)->first();
             if (!$outlet) {

packages/coupon/src/Coupon.php

@@ -2,9 +2,7 @@
 
 namespace XuanChen\Coupon;
 
-use App\Models\Activity;
 use App\Models\User;
-use Illuminate\Support\Facades\DB;
 
 /**
  * 自有卡券系统

packages/sinopec/src/Sinopec.php

@@ -2,143 +2,10 @@
 
 namespace XuanChen\Sinopec;
 
-use App\Models\Activity;
-use App\Models\User;
-use Illuminate\Support\Facades\DB;
-
 /**
  * 中石化接口
  */
 class Sinopec
 {
 
-    /**
-     * Notes: 发券接口
-     * @Author: 玄尘
-     * @Date  : 2020/6/28 15:07
-     * @param $activityId  活动编号
-     * @param $outletId    网点编号
-     * @param $mobile      手机号
-     */
-    public static function Grant($activityId, $outletId, $mobile)
-    {
-        $model = config('xuanchen_coupon.rules.ysd.model');
-
-        return (new $model)->setActivityId($activityId)
-                           ->setOutletId($outletId)
-                           ->setMobile($mobile)
-                           ->grant();
-
-    }
-
-    /**
-     * Notes: 查询接口
-     * @Author: 玄尘
-     * @Date  : 2020/7/21 11:58
-     * @param $redemptionCode
-     */
-    public static function Query($redemptionCode, $outletId)
-    {
-        if (!$redemptionCode) {
-            return '查询失败，未获取到券码';
-        }
-
-        $model = self::getModelByCode($redemptionCode);
-        if (is_string($model)) {
-            return $model;
-        }
-
-        return $model->setCode($redemptionCode)
-                     ->setOutletId($outletId)
-                     ->detail();
-    }
-
-    /**
-     * Notes: 卡券作废
-     * @Author: 玄尘
-     * @Date  : 2020/9/2 16:54
-     * @param $redemptionCode
-     * @param $outletId
-     * @return string
-     */
-    public static function Destroy($redemptionCode, $outletId)
-    {
-        try {
-            $model = self::getModelByCode($redemptionCode);
-            if (is_string($model)) {
-                return $model;
-            }
-
-            return $model->setCode($redemptionCode)
-                         ->setOutletId($outletId)
-                         ->destroy();
-        } catch (\Exception $e) {
-            return $e->getMessage();
-        }
-
-    }
-
-    /**
-     * Notes: 根据券码 获取class
-     * @Author: 玄尘
-     * @Date  : 2020/7/21 12:00
-     * @param $code
-     * @return string
-     */
-    public static function getModelByCode($code)
-    {
-        $rules = config('xuanchen_coupon.rules');
-        if (!$rules) {
-            return '系统出错，未找到配置文件';
-        }
-
-        $model = '';
-        foreach ($rules as $rule) {
-            if (preg_match($rule['pattern'], $code, $matches)) {
-                $model = $rule['model'];
-                break;
-            }
-        }
-
-        if (!$model) {
-            throw new \Exception('卡券核销失败。未查到卡券所属');
-        }
-
-        return new $model;
-
-    }
-
-    /**
-     * Notes: description
-     * @Author: 玄尘
-     * @Date  : 2020/8/21 13:33
-     * @param \App\Models\User $user           渠道
-     * @param string           $redemptionCode 要核销的券码
-     * @param float            $total          订单金额
-     * @param string           $outletId       网点id
-     * @param string           $orderid        订单id
-     * @return string
-     */
-    public static function Redemption(User $user, string $redemptionCode, float $total, string $outletId, string $orderid = '')
-    {
-
-        try {
-            $model = self::getModelByCode($redemptionCode);
-            if (is_string($model)) {
-                return $model;
-            }
-
-            return $model->setUser($user)
-                         ->setCode($redemptionCode)
-                         ->setTotal($total)
-                         ->setOutletId($outletId)
-                         ->setOrderId($orderid)
-                         ->start();
-
-        } catch (\Exception $e) {
-            return $e->getMessage();
-        }
-
-    }
-
 }

storage/cert/unionpay/public_rsa.pem

@@ -0,0 +1,6 @@
+-----BEGIN PUBLIC KEY-----
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDqWyL8fkpHtCS0hN60Y8kchp/B
+S4r6aXyu9VE9fW/z/JKL50V+dP1bZ7Dl0eJqWN+mEYMQ9D5DVA89fpqYXI3jc8Dl
+yeKsjXOWpLV+a+MnmhPxO3IMP3+i+orSzJHF6kWHxgivloJVl7bq8xah2u/5BjUP
+nBju+BlZK478uwU2rwIDAQAB
+-----END PUBLIC KEY-----

storage/cert/unionpay/self/old/private_rsa.pem

@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXAIBAAKBgQC/1n0w5iwWPB4XuS+QX820prkO7iEFmXDh4OPTCT43HKV63Tk0
+j1oEY7rzJizvQcGQRrxHrv7syeEjrzh6b/5flqRk2XYDOO4CNO1LNuhUsVn17sMH
+4GQzrnZQDAnU1Jxlk9ttamNpkGyind071+B2azT8TdLwjGXe2e4x7M0AOwIDAQAB
+AoGAaDCMKeS5CRJ5nZTcemMuC/GJDMzUboAZyPQliFa6zZ/nWEWSbjN1RnEL9kdD
+nGZwRHXGiIBIwD4c4w6ldAojcsJB76pfdeok6gDlswk3McF2uMPUvn6Yc37nnkbz
+crXI6wDy0aPX/MfcHq2UoX5GdDYVEnOBnictxWPBMZ6S4fECQQDkH8vfaO4wGKQ2
+K1uiUHEIRv0qOUvGY/BKJtBcyE4wpHpMtlY8o2vGssvpTueBWXWp8XRShOLoo+J+
+PXrBLvTVAkEA10eUTLIvTag2nKS1B3dCJaszYWAL2otf5F4EwEKmfkFNhk7qkVm+
+Ain9h/RsKqBb9n3MeeqSqUvbSq8FzCTozwJBAM/OdzVIrNF7YPtHe+3cQVs875nr
+H6/Vkiq6OMyMW03MRuxinSQX6jHS5hXeHt2h1KG+piwViW5K/CPrdUtNrxECQA3s
+rFP1poegXL/vC2KLPTUQiMdAniOppi8wQaBp7zj1Yl1Ql22FX3vmWWbE0YZETw53
+fpVYLdpTdMC052wX6xMCQEZHbKjv9odbN6vZAcz15RC0j21brEQQ3goXSxLtjkmQ
+LkcLdiDZgqGiVjNXTnh81fVkoIh9CfTSZH0a7Zc/RvM=
+-----END RSA PRIVATE KEY-----

storage/cert/unionpay/self/old/public_rsa.pem

@@ -0,0 +1,6 @@
+-----BEGIN PUBLIC KEY-----
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC/1n0w5iwWPB4XuS+QX820prkO
+7iEFmXDh4OPTCT43HKV63Tk0j1oEY7rzJizvQcGQRrxHrv7syeEjrzh6b/5flqRk
+2XYDOO4CNO1LNuhUsVn17sMH4GQzrnZQDAnU1Jxlk9ttamNpkGyind071+B2azT8
+TdLwjGXe2e4x7M0AOwIDAQAB
+-----END PUBLIC KEY-----

storage/cert/unionpay/self/private_rsa.pem

@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXAIBAAKBgQCbCoYOxjVu15ONuotlIBxiyMQP+Ch8TavHHVTDrY54mRPLq0dR
+Xrlpj+Ziu8PY8kHfPdNbRlftVQUgnhfOP/2j2QbnTDAF4tUZ0B9YjvCgLMpGMOAZ
+tuw+u+VwVILegUUO3Yh/T6nZ4kcMw5vj/N4vGdHcABV+BK7639+Xep1OlQIDAQAB
+AoGAR1Z5RpUHAwBoYV9DQn2a8g0kwaBSqJdogc7KMNtL4cu1oxIlV5h5Qcw3mpiA
+zfLyQlEFTks4q/hhypdTptAk2SblXh0yc7TU1xD984j+ZfWB7r+Nu0OyaWIBPih5
+Mn7DynQ5q7dnwff5nmYqi49xUPVTKAGJKiYTkKyA5UwauEECQQDK+fw5Ybf96LvH
+WsvspUJ/YhQMhcZ6PLINLeHuEJwxoygnDNK2UbBPFFb5ZjIh5PHh8EtkPANZY0uH
+voP4gC8lAkEAw4reMtlMiJQlRmsMguahWQXIo6PPwclSqXK/aYzqjkPrwWQZdXa/
+LcCd77D0qLvkDEUM2Kh9NsNayd3F+37+sQJAb0Lgs0ORa6krZXer2Kgt701/1+1s
+gozKvNatxaVtOPhKhj1NM4tLrc1kb4lJabLptAPYD7Wl0FXRjTMtfAYn0QJAVmMO
+QRag6iHQyehXEamEFIkql6iyCyG/BB8ukxnvMcSt7bUkTjGUykizPYZGwBip6gXD
+ZCAjmUL64/23DqGPMQJBAIUUShpi307GBmC0AXyvkt36tPYvDMykF4qHivScbZF+
+UJ2e5Y0lvR/+5bEgFcLk7phW5XxofcFWxO7BSbu2bGk=
+-----END RSA PRIVATE KEY-----

storage/cert/unionpay/self/public_rsa.pem

@@ -0,0 +1,6 @@
+-----BEGIN PUBLIC KEY-----
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCbCoYOxjVu15ONuotlIBxiyMQP
++Ch8TavHHVTDrY54mRPLq0dRXrlpj+Ziu8PY8kHfPdNbRlftVQUgnhfOP/2j2Qbn
+TDAF4tUZ0B9YjvCgLMpGMOAZtuw+u+VwVILegUUO3Yh/T6nZ4kcMw5vj/N4vGdHc
+ABV+BK7639+Xep1OlQIDAQAB
+-----END PUBLIC KEY-----