调整接口

.gitignore

@@ -3,4 +3,8 @@
 .editorconfig
 .env
 /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

@@ -73,7 +73,8 @@ class IndexController extends AdminController
     protected function grid()
     {
         $grid = new Grid(new Activity);
-        $grid->model()->with(['grants.user', 'verifications.user']);
+        $grid->model()->withCount('coupons');
+
         $grid->actions(function ($actions) {
             $actions->disableView();
         });
@@ -99,6 +100,8 @@ class IndexController extends AdminController
         $grid->column('id', '#ID#');
         $grid->column('title', '活动名称');
         $grid->column('code', '活动编号');
+        $grid->column('total', '可发券总数');
+        $grid->column('coupons_count', '可发券总数');
         $grid->column('rule.code', '卡券规则');
         $grid->column('类型')->display(function () {
             return $this->type_text;
@@ -155,6 +158,11 @@ class IndexController extends AdminController
              })
              ->required();
 
+        $form->number('total', '总数')
+             ->help('可发券总数')
+             ->default(10000)
+             ->required();
+
         $form->radio('type', '类型')
              ->options(Activity::TYPES)
              ->when(Activity::TYPE_EXTEND, function (Form $form) {
@@ -192,6 +200,16 @@ class IndexController extends AdminController
 
         $form->saving(function (Form $form) {
             $request = request();
+
+            if ($request->total < 0) {
+                $error = new MessageBag([
+                    'title'   => '错误',
+                    'message' => '可发券总数必须大于0',
+                ]);
+
+                return back()->withInput()->with(compact('error'));
+            }
+
             if ($request->type == Activity::TYPE_EXTEND && empty($request->days)) {
                 $error = new MessageBag([
                     'title'   => '错误',
@@ -209,6 +227,7 @@ class IndexController extends AdminController
 
                 return back()->withInput()->with(compact('error'));
             }
+
             if (request()->start) {
                 $form->start_at = $form->start_at . ' 00:00:01';
             }
@@ -216,6 +235,7 @@ class IndexController extends AdminController
             if (request()->end_at) {
                 $form->end_at = $form->end_at . ' 23:59:59';
             }
+
         });
 
         $form->saved(function (Form $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,6 +17,22 @@ class TestController
 
     public function index(Request $request)
     {
+        $this->user = User::find(6);
+        $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);
@@ -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());
 

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 '发券失败,没有找到这个活动。';
             }
@@ -22,6 +23,14 @@ class YsdGrant extends Init
                 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) {
                 return '发券失败,未查询到此网点信息。';

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-----