增加说明

.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/Account/LogController.php

@@ -16,7 +16,7 @@ class LogController extends AdminController
     function grid()
     {
         $grid = new Grid(new AccountLog);
-        $grid->model()->latest();
+        $grid->model()->with(['account'])->latest();
         $userId = request()->user_id;
         $grid->model()->when($userId, function ($query, $userId) {
             $query->where('user_id', $userId);

app/Admin/Controllers/Activity/CouponController.php

@@ -16,7 +16,7 @@ class CouponController extends AdminController
     protected function grid()
     {
         $grid = new Grid(new ActivityCoupon);
-        $grid->model()->latest();
+        $grid->model()->with(['outlet'])->latest();
         $grid->disableActions();
         $grid->disableCreateButton();
 

app/Admin/Controllers/Activity/IndexController.php

@@ -101,7 +101,7 @@ class IndexController extends AdminController
         $grid->column('title', '活动名称');
         $grid->column('code', '活动编号');
         $grid->column('total', '可发券总数');
-        $grid->column('coupons_count', '可发券总数');
+        $grid->column('coupons_count', '已发券总数');
         $grid->column('rule.code', '卡券规则');
         $grid->column('类型')->display(function () {
             return $this->type_text;
@@ -159,7 +159,7 @@ class IndexController extends AdminController
              ->required();
 
         $form->number('total', '总数')
-             ->help('可发券总数')
+             ->help('可发券总数，0为不限制')
              ->default(10000)
              ->required();
 

app/Admin/Controllers/Finance/CensusController.php

@@ -47,7 +47,8 @@ class CensusController extends AdminController
     {
         $grid = new Grid(new User);
 
-        $grid->model()->whereHas('identity', function ($q) {
+        $grid->model()
+            ->whereHas('identity', function ($q) {
                 $q->where('identity_id', 1);
             });
 

app/Admin/Controllers/Finance/IndexController.php

@@ -13,7 +13,7 @@ use Encore\Admin\Grid;
 class IndexController extends AdminController
 {
 
-    protected $title = '渠道打款处理';
+    protected $title = '平安渠道打款处理';
 
     /**
      * Notes:

app/Admin/Controllers/Finance/LogController.php

@@ -33,10 +33,12 @@ class LogController extends AdminController
         $grid->filter(function ($filter) {
             $filter->column(1 / 2, function ($filter) {
                 $filter->between('paid_at', '打款时间')->datetime();
-                $users = User::whereHas('identity', function ($query) {
+                $users = User::query()
+                             ->whereHas('identity', function ($query) {
                                  $query->where('identity_id', 1);
-                })->get()->pluck('nickname', 'id');
-                
+                             })
+                             ->get()
+                             ->pluck('nickname', 'id');
                 $filter->equal('user_id', '渠道')->select($users);
             });
             $filter->column(1 / 2, function ($filter) {

app/Admin/Controllers/HomeController.php

@@ -17,7 +17,7 @@ class HomeController extends Controller
     {
 
         return $content
-            ->title('数据看版1')
+            ->title('数据看版2')
             ->row(function (Row $row) {
                 $row->column(2, function (Column $column) {
                     $column->append(new InfoBox(

app/Admin/Controllers/IdentityController.php

@@ -10,6 +10,7 @@ use RuLong\Identity\Models\Identity;
 
 class IdentityController extends AdminController
 {
+
     protected $title = '用户身份配置';
 
     protected function grid()
@@ -47,6 +48,7 @@ class IdentityController extends AdminController
 
         $grid->column('remark', '说明');
         $grid->column('updated_at', '修改时间');
+
         return $grid;
     }
 

app/Admin/Controllers/Log/IndexController.php

@@ -2,6 +2,8 @@
 
 namespace App\Admin\Controllers\Log;
 
+use App\Admin\Renderable\Log\InData;
+use App\Admin\Renderable\Log\OutData;
 use App\Models\Log;
 use Encore\Admin\Controllers\AdminController;
 use Encore\Admin\Grid;
@@ -15,7 +17,7 @@ class IndexController extends AdminController
     /**
      * Notes:
      * @Author: <C.Jason>
-     * @Date: 2019/9/18 14:50
+     * @Date  : 2019/9/18 14:50
      * @return Grid
      */
     protected function grid()
@@ -57,7 +59,15 @@ class IndexController extends AdminController
             return new Table($header, $array);
         });
         $grid->column('method', '模式');
-        // $grid->column('in_source', '请求参数');
+        //        $grid->column('in_source', '请求参数')
+        //             ->display(function ($title, $column) {
+        //                 return '点击展开';
+        //             })->modal(InData::class);
+        //
+        //        $grid->column('out_source', '返回参数')
+        //             ->display(function ($title, $column) {
+        //                 return '点击展开';
+        //             })->modal(OutData::class);
         $grid->column('请求参数')->display(function () {
             $in_source = $this->in_source;
             unset($in_source['merchantSign']);
@@ -67,9 +77,9 @@ class IndexController extends AdminController
             unset($in_source['json']);
             unset($in_source['query']['merchantSign']);
             unset($in_source['query']['merchantCert']);
+
             return $in_source;
         });
-        // $grid->column('out_source', '返回信息');
         $grid->column('返回信息')->display(function () {
             $out_source = $this->out_source;
 
@@ -83,6 +93,7 @@ class IndexController extends AdminController
             if (isset($out_source['data']) && is_string($out_source['data'])) {
                 unset($out_source['data']);
             }
+
             return $out_source;
         });
         $grid->column('created_at', '提交时间');

app/Admin/Controllers/Unionpay/IndexController.php

@@ -0,0 +1,91 @@
+<?php
+
+namespace App\Admin\Controllers\Unionpay;
+
+use App\Admin\Actions\User\Callback;
+use App\Admin\Actions\User\Profit;
+use App\Admin\Actions\User\ReCode;
+use App\Admin\Actions\User\RefD3Key;
+use App\Admin\Exporters\UsersExport;
+use App\Admin\Renderable\Unionpay\InData;
+use App\Admin\Renderable\Unionpay\OutData;
+use App\Models\Area;
+use App\Models\UnionpayLog;
+use App\Models\User;
+use Auth;
+use Encore\Admin\Controllers\AdminController;
+use Encore\Admin\Form;
+use Encore\Admin\Grid;
+use Encore\Admin\Widgets\Table;
+use Illuminate\Http\Request;
+use RuLong\Identity\Models\Identity;
+
+class IndexController extends AdminController
+{
+
+    protected $title = '银联操作日志';
+
+    /**
+     * Notes:
+     * @Author: <C.Jason>
+     * @Date  : 2019/9/18 14:50
+     * @return Grid
+     */
+    protected function grid()
+    {
+        $grid = new Grid(new UnionpayLog);
+
+        $grid->disableActions();
+        $grid->disableCreateButton();
+        $grid->model()->orderBy('id', 'desc');
+
+        $grid->filter(function ($filter) {
+            $filter->column(1 / 2, function ($filter) {
+                $filter->equal('msg_txn_code', '交易类型')->select(config('unionpay.type'));
+            });
+            $filter->column(1 / 2, function ($filter) {
+                $filter->equal('req_serial_no', '流水号');
+                $filter->equal('orig_req_serial_no', '原流水号');
+            });
+        });
+
+        $grid->column('id', '#ID#');
+        $grid->column('msg_txn_code', '交易类型')
+             ->using(config('unionpay.type'))
+             ->label();
+
+        //        $grid->column('msg_crrltn_id', '消息关联号');
+        $grid->column('msg_time', '报文日期');
+        $grid->column('mkt_code', '券码');
+        $grid->column('msg_sys_sn', '平台流水号');
+        $grid->column('req_serial_no', '流水号');
+        $grid->column('orig_req_serial_no', '原流水号');
+        $grid->column('status', '状态')
+             ->using(UnionpayLog::STATUS)
+             ->label([
+                 0 => 'success',
+                 1 => 'warning',
+             ]);
+
+        $grid->column('in_source', '请求参数')
+             ->display(function ($title, $column) {
+                 return '点击展开';
+             })->modal(InData::class);
+
+        $grid->column('out_source', '返回参数')
+             ->display(function ($title, $column) {
+                 return '点击展开';
+             })->modal(OutData::class);
+
+        //        $grid->column('sett_date', '清算日期');
+        $grid->column('created_at', '注册时间');
+        $grid->disableExport(false);
+
+        $grid->export(function ($export) {
+            $export->filename($this->title . date("YmdHis"));
+        });
+
+        return $grid;
+    }
+
+}

app/Admin/Controllers/User/IndexController.php

@@ -6,7 +6,8 @@ use App\Admin\Actions\User\Callback;
 use App\Admin\Actions\User\Profit;
 use App\Admin\Actions\User\ReCode;
 use App\Admin\Actions\User\RefD3Key;
-use App\Admin\Exporters\UsersExport;
+use App\Admin\Renderable\User\Rule;
+use App\Admin\Renderable\User\ServerKey;
 use App\Models\Area;
 use App\Models\User;
 use Auth;
@@ -32,7 +33,7 @@ class IndexController extends AdminController
     {
         $user = Auth::guard('admin')->user();
         $grid = new Grid(new User);
-
+        $grid->model()->with(['parent']);
         $grid->actions(function ($actions) use ($user) {
             $actions->disableDelete();
             $actions->disableView();
@@ -112,19 +113,7 @@ class IndexController extends AdminController
 
         $grid->column('密钥')->display(function ($title, $column) {
             return '点击查看';
-        })->modal(function ($model) {
-            $data = [
-                [
-                    '服务秘钥', $model->server_key ?? '---',
-                ],
-                [
-                    'DES3秘钥', $model->des3key ?? '---',
-                ],
-            ];
-
-            return new Table(['名称', '参数'], $data);
-
-        });
+        })->modal(ServerKey::class);
 
         $grid->column('nickname', '渠道/网点');
         $grid->column('用户身份')->display(function () {
@@ -142,22 +131,13 @@ class IndexController extends AdminController
 
         $grid->column('分润规则')->display(function ($title, $column) {
             return '点击展开';
-        })->modal(function ($model) {
-            if ($model->code) {
-                $codes = $model->code->map(function ($code) {
-                    return $code->only(['name', 'code', 'profit']);
-                });
-
-                return new Table(['名称', '规则项', '分润金额(元)'], $codes->toArray());
-            }
-
-        });
+        })->modal(Rule::class);
 
         $grid->column('created_at', '注册时间');
         $grid->disableExport(false);
 
         $grid->export(function ($export) {
-            $export->except(['密钥', '分润规则']);
+            $export->except(['密钥', '分润规则', '回调地址']);
             $export->column('用户身份', function ($value, $original) {
                 return strip_tags($value);
             });
@@ -167,7 +147,7 @@ class IndexController extends AdminController
             $export->column('网点编号', function ($value, $original) {
                 return $value . "\t";
             });
-            $export->filename('用户管理' . date("YmdHis"));
+            $export->filename($this->title . date("YmdHis"));
         });
 
         return $grid;

app/Admin/Controllers/Wo/IndexController.php

@@ -24,6 +24,7 @@ class IndexController extends AdminController
     protected function grid()
     {
         $grid = new Grid(new WoCoupon);
+        $grid->model()->with(['user']);
         $grid->disableCreateButton();
         $grid->disableBatchActions();
         // $grid->disableActions();

app/Admin/Renderable/Log/InData.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Admin\Renderable\Log;
+
+use App\Models\Log;
+use Encore\Admin\Widgets\Table;
+use Illuminate\Contracts\Support\Renderable;
+
+class InData implements Renderable
+{
+
+    public function render($key = null)
+    {
+        $log       = Log::find($key);
+        $in_source = $log->in_source;
+        foreach ($in_source as $key => $item) {
+            if (!in_array($key, [])) {
+
+            }
+            if (is_array($item)) {
+                $in_source[$key] = json_encode($item);
+            }
+        }
+    
+        if (is_array($in_source) && count($in_source) > 1) {
+            $table = new Table(['名称', '值'], $in_source, ['panel', ' panel-default']);
+
+            return $table->render();
+        }
+    }
+
+}

app/Admin/Renderable/Log/OutData.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Admin\Renderable\Log;
+
+use App\Models\Log;
+use Encore\Admin\Widgets\Table;
+use Illuminate\Contracts\Support\Renderable;
+
+class OutData implements Renderable
+{
+
+    public function render($key = null)
+    {
+        $log        = Log::find($key);
+        $out_source = $log->out_source;
+
+        if (is_array($out_source) && count($out_source) > 1) {
+            unset($out_source['sign']);
+            $table = new Table(['名称', '值'], $out_source, ['panel ', 'panel-success']);
+
+            return $table->render();
+        }
+    }
+
+}

app/Admin/Renderable/Unionpay/InData.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Admin\Renderable\Unionpay;
+
+use App\Models\UnionpayLog;
+use App\Models\User;
+use Encore\Admin\Widgets\Table;
+use Illuminate\Contracts\Support\Renderable;
+use Illuminate\Http\Request;
+
+class InData implements Renderable
+{
+
+    public function render($key = null)
+    {
+        $log       = UnionpayLog::find($key);
+        $in_source = $log->in_source;
+
+        if (is_array($in_source) && count($in_source) > 1) {
+            $table = new Table(['名称', '值'], $in_source, ['panel', ' panel-default']);
+
+            return $table->render();
+        }
+    }
+
+}

app/Admin/Renderable/Unionpay/OutData.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Admin\Renderable\Unionpay;
+
+use App\Models\UnionpayLog;
+use Encore\Admin\Widgets\Table;
+use Illuminate\Contracts\Support\Renderable;
+
+class OutData implements Renderable
+{
+
+    public function render($key = null)
+    {
+        $log        = UnionpayLog::find($key);
+        $out_source = $log->out_source;
+
+        if (is_array($out_source) && count($out_source) > 1) {
+            unset($out_source['sign']);
+            $table = new Table(['名称', '值'], $out_source, ['panel ', 'panel-success']);
+
+            return $table->render();
+        }
+    }
+
+}

app/Admin/Renderable/User/Rule.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Admin\Renderable\User;
+
+use App\Models\User;
+use Encore\Admin\Widgets\Table;
+use Illuminate\Contracts\Support\Renderable;
+
+class Rule implements Renderable
+{
+
+    public function render($key = null)
+    {
+        $user  = User::find($key);
+        $codes = $user->code->map(function ($code) {
+            return $code->only(['name', 'code', 'profit']);
+        });
+        $table = new Table(['名称', '规则项', '分润金额(元)'], $codes->toArray());
+
+        return $table->render();
+    }
+
+}

app/Admin/Renderable/User/ServerKey.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Admin\Renderable\User;
+
+use App\Models\User;
+use Encore\Admin\Widgets\Table;
+use Illuminate\Contracts\Support\Renderable;
+
+class ServerKey implements Renderable
+{
+
+    public function render($key = null)
+    {
+        $user = User::find($key);
+
+        $data = [
+            [
+                '服务秘钥', $user->server_key ?? '---',
+            ],
+            [
+                'DES3秘钥', $user->des3key ?? '---',
+            ],
+        ];
+
+        $table = new Table(['名称', '参数'], $data);
+
+        return $table->render();
+    }
+
+}

app/Admin/routes.php

@@ -55,4 +55,7 @@ Route::group([
     $router->resource('activitycoupons', 'Activity\CouponController');
     $router->resource('activitycouponlogs', 'Activity\LogController');
 
+    //银联日志
+    $router->resource('unionpays', 'Unionpay\IndexController');
+
 });

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/Controllers/UnionPayController.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace App\Api\Controllers;
+
+use Illuminate\Http\Request;
+use XuanChen\UnionPay\UnionPay;
+use Illuminate\Support\Facades\Http;
+
+class UnionPayController extends Controller
+{
+
+    public function index(Request $request)
+    {
+        $a = '0.1';
+        $b = '0.1';
+        dump($a > $b);
+        $action = new UnionPay($request->all());
+        //        $sign         = $action->getSign(false);
+        $sign         = 'd8e5bf46d0d9f1da702170c2e141d85cf3ca785106886dbfedb3310ee9ce2ca3f18a2e6c179ec9908fc4f41d05df463634106918bdbefc63b8f199c7d2f3b0d45510b4dd6ccdf4549e11a8551a5098b14c01fdaa5840a4608f462fdafdc14b8f2a35471da315d8245a4ef6281b6e04bd22d5a266500a6caf6e5203202c37111d';
+        $action->sign = $sign;
+        $res          = $action->checkSign(false, false);
+        dump('签名： ' . $sign);
+        $res_str = ($res === true) ? '成功' : '失败';
+        dump('验签结果：' . $res_str);
+        dd($action);
+
+    }
+
+    /**
+     * Notes: 银联接口
+     * @Author: 玄尘
+     * @Date  : 2020/9/28 16:31
+     * @param Request $request
+     * @return mixed
+     */
+    public function query(Request $request)
+    {
+        $inputs = $request->all();
+        $app    = app('xuanchen.unionpay');
+        $app->setParams($inputs);
+        $app->start();
+
+        return $app->respond();
+    }
+
+}

app/Api/Controllers/UserController.php

@@ -41,7 +41,7 @@ class UserController extends Controller
     {
         $inputdata = $request->all();
         $res       = $this->checkSign($request);
-
+        //获取解密后数据
         $inputdata['jiemi'] = $res;
         $log                = $this->createLog($request->url(), 'POST', $inputdata, 'grant'); //添加日志
 

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');
 
@@ -18,4 +20,8 @@ Route::group(['prefix' => 'V1'], function () {
     Route::post('ticket/cancel', 'WoController@cancel');               //退业务
     Route::post('ticket/query', 'WoController@query');                 //退业务
 
+    //银联相关
+    Route::post('unionpay/index', 'UnionPayController@index');
+    Route::post('unionpay/query', 'UnionPayController@query');
+
 });

app/Exceptions/Handler.php

@@ -7,18 +7,16 @@ use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
 
 class Handler extends ExceptionHandler
 {
+
     /**
      * A list of the exception types that are not reported.
-     *
      * @var array
      */
     protected $dontReport = [
-        //
     ];
 
     /**
      * A list of the inputs that are never flashed for validation exceptions.
-     *
      * @var array
      */
     protected $dontFlash = [
@@ -28,7 +26,6 @@ class Handler extends ExceptionHandler
 
     /**
      * Report or log an exception.
-     *
      * @param \Exception $exception
      * @return void
      */
@@ -39,7 +36,6 @@ class Handler extends ExceptionHandler
 
     /**
      * Render an exception into an HTTP response.
-     *
      * @param \Illuminate\Http\Request $request
      * @param \Exception               $exception
      * @return \Illuminate\Http\Response
@@ -48,4 +44,5 @@ class Handler extends ExceptionHandler
     {
         return parent::render($request, $exception);
     }
+
 }

app/Http/Controllers/SkyxuController.php

@@ -2,44 +2,330 @@
 
 namespace App\Http\Controllers;
 
-use App\Api\Controllers\ApiResponse;
+use App\Models\Coupon;
+use App\Models\TestLog;
+use App\Models\User;
+use Illuminate\Queue\Jobs\Job;
+use XuanChen\Coupon\Action\pingan\Query;
+use XuanChen\Coupon\Action\ysd\YsdQuery;
 
 class SkyxuController
 {
-    use ApiResponse;
+
+    public $user;
+
+    public $jiemi;
+
+    public $query_coupon;
+
+    public $ticket;
+
+    public $type;
 
     public function index()
     {
-        $postData = [
-            'server_id' => '20200103490104',
-            'key'       => 'rRhHO7Jbao2SSxAH8VygV4DgS4L2WESa',
-            'addcode'   => '69198663',
-            'sign'      => '6cd2232e9aa853219a0dff80430567796d0ae33d6c0289dfa835813def08ed8c',
-            'data'      => 'DBEgnb5HidvKQDyxL0BAcCwuMkVdbTZRVu4mxwwzAM5TWj\/HAQfcrH9VzcgdG42lINsHYvI2Tv+MJfyP9eXVEQ==',
+        $list = Job::get();
+        dd($list);
+        Coupon::whereBetween('id', ['70091', '70513'])
+              ->orderBy('created_at', 'ASC')
+              ->chunk(100, function ($logs) {
+                  foreach ($logs as $log) {
+                      if (preg_match('/^YSD/', $log->redemptionCode, $matches)) {
+                          $type = Coupon::TYPE_YSD;
+                      } else {
+                          $type = Coupon::TYPE_PINGAN;
+                      }
+
+                      $log->type = $type;
+                      $log->save();
+                  }
+              });
+
+        dd();
+        $count = TestLog::whereBetween('created_at', ['2020-11-10 11:06:40', '2020-11-11 10:42:26'])
+                        ->where('type', 'freezecoupon')
+                        ->where('back', '0')
+                        ->orderBy('created_at', 'ASC')
+                        ->count();
+        dump($count);
+        //        $list = TestLog::whereBetween('created_at', ['2020-11-10 11:06:40', '2020-11-11 10:42:26'])
+        //                       ->where('type', 'freezecoupon')
+        //                       ->where('back', '0')
+        //                       ->orderBy('created_at', 'ASC')
+        //                       ->get();
+        //
+        ////        $data = [];
+        ////        foreach ($list as $cou) {
+        ////            $data[] = $cou->in_source['jiemi']['redemptionCode'];
+        ////        }
+        ////        dump($data);
+
+        if ($count > 1) {
+            try {
+                TestLog::whereBetween('created_at', ['2020-11-10 11:06:40', '2020-11-11 10:42:26'])
+                       ->where('type', 'freezecoupon')
+                       ->where('back', '0')
+                       ->orderBy('created_at', 'ASC')
+                       ->chunk(100, function ($logs) {
+                           $su = $er = [];
+
+                           foreach ($logs as $log) {
+
+                               $this->jiemi = $log->in_source['jiemi'];
+                               $this->user  = User::where('outlet_id', $this->jiemi['outletId'])->first();
+                               $this->getQuery();
+
+                               if (is_string($this->queryData)) {
+                                   $er[$this->jiemi['redemptionCode']] = $this->queryData;
+                                   continue;
+                               }
+
+                               if ($this->jiemi['redemptionCode'] == '157922465040') {
+                                   dump($this->jiemi);
+                                   dump($this->ticket);
+                                   dump($this->queryData);
+                               }
+
+                               $this->checkCode();
+                               if (is_string($this->ticket)) {
+                                   $er[$this->jiemi['redemptionCode']] = $this->ticket;
+
+                                   $er[] = $this->jiemi['redemptionCode'];
+
+                                   continue;
+                               }
+
+                               $status = isset($log->out_source['code']) ? 2 : 3;
+                               $exists = Coupon::where('status', $status)
+                                               ->where('redemptionCode', $this->jiemi['redemptionCode'])->exists();
+                               if ($exists && $status != 3) {
+                                   $er[$this->jiemi['redemptionCode']] = [
+                                       $log->out_source,
                                    ];
 
-        $curl = curl_init();
+                                   continue;
+                               }
 
-        curl_setopt_array($curl, array(
-            CURLOPT_URL            => "http://pa.cnskl.com/api/V1/user/freezecoupon",
-            CURLOPT_RETURNTRANSFER => true,
-            CURLOPT_ENCODING       => "",
-            CURLOPT_MAXREDIRS      => 10,
-            CURLOPT_TIMEOUT        => 0,
-            CURLOPT_FOLLOWLOCATION => true,
-            CURLOPT_HTTP_VERSION   => CURL_HTTP_VERSION_1_1,
-            CURLOPT_CUSTOMREQUEST  => "POST",
-            CURLOPT_POSTFIELDS     => $postData,
-            CURLOPT_HTTPHEADER     => array(
-                "Content-Type: multipart/form-data;",
-            ),
-        ));
+                               $couponData = [
+                                   'user_id'           => $this->user->parent->id,
+                                   'type'              => Coupon::TYPE_YSD,
+                                   'outletId'          => $this->user->outlet_id,
+                                   'orderid'           => '',
+                                   'PaOutletId'        => $this->queryData['PaOutletId'],
+                                   'redemptionCode'    => $this->jiemi['redemptionCode'],
+                                   'thirdPartyGoodsId' => $this->queryData['thirdPartyGoodsId'],
+                                   'couponName'        => $this->queryData['couponName'],
+                                   'price'             => $this->ticket['price'],
+                                   'total'             => $this->jiemi['total'],
+                                   'profit'            => $this->ticket['profit'],
+                                   'status'            => $status,
+                                   'remark'            => isset($log->out_source['code']) ? '核销成功！' : $log->out_source[0],
+                                   'startTime'         => $this->queryData['startTime'],
+                                   'endTime'           => $this->queryData['endTime'],
+                                   'created_at'        => $log->created_at->format('Y-m-d H:i:s'),
+                               ];
 
-        $response = curl_exec($curl);
+                               //                           dump($this->jiemi);
+                               //                           dump($this->ticket);
+                               //                           dump($couponData);
+                               //                           dd($this->queryData);
 
-        curl_close($curl);
-        echo $response;
+                               $coupon = Coupon::create($couponData);
+                               $coupon->profit();
+
+                               $log->back = 1;
+                               $log->save();
 
                            }
 
+                           if (count($er) > 1) {
+                               dump($er);
+                           }
+                       });
+            } catch (\Exception $e) {
+                dd($e->getMessage());
+            }
+        }
+
+    }
+
+    public function getQuery()
+    {
+        if (preg_match('/^YSD/', $this->jiemi['redemptionCode'], $matches)) {
+            $this->query_coupon = (new YsdQuery)->setOutletId($this->jiemi['outletId'])
+                                                ->setCode($this->jiemi['redemptionCode'])
+                                                ->start();
+            $this->type         = 'ysd';
+        } else {
+            $this->query_coupon = (new Query)->setOutletId($this->jiemi['outletId'])
+                                             ->setCode($this->jiemi['redemptionCode'])
+                                             ->start();
+            $this->type         = 'pingan';
+
+        }
+
+        if ($this->type == 'ysd') {
+            return $this->getYsdPro();
+
+        } else {
+            return $this->getPro();
+        }
+
+    }
+
+    public function getYsdPro()
+    {
+        $rule_code = $this->query_coupon->activity->rule->code;
+        $code      = $this->user->parent->code->where('code', $rule_code)->first();
+
+        if (!$code) {
+            $this->queryData = "核销失败，您没有权限使用此卡券优惠活动。";
+        }
+
+        $ticket = explode('-', $rule_code);
+        if (!is_array($ticket) || count($ticket) != 3) {
+            $this->queryData = "核销失败，卡券规则格式不正确";
+        }
+
+        $full  = $ticket[1]; //full100
+        $price = $ticket[2];
+        //        preg_match('/(\d{3}(\.\d+)?)/is', $full, $match);
+        preg_match('/\d+/', $full, $match);
+
+        if (!is_array($match)) {
+            $this->queryData = "核销失败，卡券规则格式不正确。";
+        }
+
+        if (!is_numeric($this->jiemi['total'])) {
+            $this->queryData = "核销失败，订单金额必须是数字";
+        }
+
+        if ($match[0] > $this->jiemi['total']) {
+            $this->queryData = '核销失败，订单金额不足。';
+        }
+
+        $this->queryData = [
+            'couponName'        => $this->query_coupon->activity->title,
+            'thirdPartyGoodsId' => $rule_code,
+            'productId'         => '',
+            'PaOutletId'        => '',
+            'startTime'         => $this->query_coupon->start_at->format('Y-m-d H:i:s'),
+            'endTime'           => $this->query_coupon->end_at->format('Y-m-d H:i:s'),
+        ];
+
+        return $this->ticket = [
+            'total'  => $match[0],
+            'price'  => $price,
+            'profit' => $code->profit,
+        ];
+    }
+
+    public function getPro()
+    {
+
+        if (is_string($this->query_coupon)) {
+            return $this->query_coupon;
+        }
+
+        $profitOfferItemVersion = $this->query_coupon['profitOfferItemVersion'];
+
+        $productItemList = $this->query_coupon['productItemList'];
+
+        if (!is_array($productItemList) || !is_array($productItemList[0])) {
+            $this->queryData = '核销失败，平安券数据有误，可能是未配置网点。';
+        }
+
+        //循环查找
+        $first = '';
+        foreach ($productItemList as $key => $item) {
+            $productId         = $item['productId'];
+            $thirdPartyGoodsId = $item['thirdPartyGoodsId'];
+            $outletList        = $item['outletList'];
+            if (!is_array($outletList) || !is_array($outletList[0])) {
+                $this->queryData = '核销失败，网点信息有误！请检查平安券配置信息。';
+                break;
+            }
+
+            $outletList = collect($outletList);
+            //判断是新版还是旧版
+            if ($profitOfferItemVersion) {
+                //新版通过第三方查询
+                $first = $outletList->firstWhere('thirdOutletNo', $this->user->outlet_id);
+
+                if ($first) {
+                    break;
+                }
+            } else {
+                //旧版通过平安网点查询
+                $first = $outletList->firstWhere('outletNo', $this->user->PaOutletId);
+                if ($first) {
+                    break;
+                }
+            }
+        }
+
+        if (!$first) {
+            $this->queryData = '核销失败，未找到可用网点信息。';
+        }
+
+        if (!$thirdPartyGoodsId) {
+            $this->queryData = '核销失败，平安券编号规则有误。';
+        }
+
+        if (!$productId) {
+            $this->queryData = '核销失败，未查询到平安券商品id。';
+        }
+
+        return $this->queryData = [
+            'couponName'        => $this->query_coupon['couponName'],
+            'thirdPartyGoodsId' => $thirdPartyGoodsId,
+            'productId'         => $productId,
+            'PaOutletId'        => $first['outletNo'],
+            'startTime'         => $this->query_coupon['startTime'],
+            'endTime'           => $this->query_coupon['endTime'],
+        ];
+
+    }
+
+    public function checkCode()
+    {
+        if ($this->type == 'ysd') {
+            return $this->ticket;
+        }
+
+        $code = $this->user->parent->code->where('code', $this->queryData['thirdPartyGoodsId'])->first();
+        if (!$code) {
+            $this->ticket = "核销失败，未找到此项平安券规则,请联系管理人员检查渠道配置。";
+        }
+
+        $ticket = explode('-', $this->queryData['thirdPartyGoodsId']);
+
+        if (!is_array($ticket) || count($ticket) != 3) {
+            $this->ticket = "核销失败，平安券规则格式不正确。";
+        }
+
+        $full  = $ticket[1]; //full100
+        $price = $ticket[2];
+        preg_match('/\d+/', $full, $result);
+
+        if (empty($result) || !is_array($result)) {
+            $this->ticket = "核销失败，平安券规则格式不正确。";
+        }
+
+        if (!is_numeric($this->jiemi['total'])) {
+            $this->ticket = "核销失败，订单金额必须是数字";
+        }
+        if ($result[0] > $this->jiemi['total']) {
+            $this->ticket = '核销失败，订单金额不足，平安券不可使用。';
+        }
+
+        $this->ticket = [
+            'total'  => $result[0],
+            'price'  => $price,
+            'profit' => $code->profit,
+        ];
+
+        return $this->ticket;
+    }
+
 }

app/Http/Controllers/TestController.php

@@ -3,53 +3,53 @@
 namespace App\Http\Controllers;
 
 use App\Api\Controllers\ApiResponse;
-use SelfCoupon;
 use App\Models\User;
 use GuzzleHttp\Client;
 use Illuminate\Http\Request;
 use XuanChen\Coupon\Coupon;
 
-// use Wo;
-
 class TestController
 {
 
     use ApiResponse;
 
-    public $baseUrl = 'http://pa.ysd-bs.com/api/V1/';
+    public $baseUrl = 'http://pac.ysd-bs.com/api/V1/';
 
     public function index(Request $request)
     {
-        //        $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);
-        //        $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(4);
+        $this->user = User::find(6);
         $ret        = [
-            'variable' => 100,
-            'mobile'   => 15663876870,
-            'type'     => 'silver',
-            'remark'   => '测试',
+            'redemptionCode' => 'YSD201029312435',
+            'outletId'       => '2008030929274',
+        ];
+
+        $ret = [
+            'mobile'     => '15663876870',
+            'orderid'    => '202008105236478',
+            'activityId' => 'ysd202010272',
+            'outletId'   => '2008241014458',
+
         ];
-        $res['server_id'] = $this->user->server_id;
-        $res['des']       = $this->user->des3key;
-        $res['key']       = $this->user->server_key;
 
         return $this->success($ret);
         dd();
-        $this->user = User::find(4);
+        $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);
+        $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        = [
             'redemptionCode' => '951951858070',
             'total'          => 5,
-            'outletId'       => '2008241014458',
+            'outletId'       => '2006151433887',
         ];
 
         return $this->success($ret);
@@ -90,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());
 
@@ -234,7 +234,7 @@ class TestController
         return $ret;
     }
 
-    function getMemoryUsage($precision = 2)
+    public function getMemoryUsage($precision = 2)
     {
         $size = memory_get_usage(true);
 
@@ -243,7 +243,7 @@ class TestController
         return round($size / pow(1024, ($i = floor(log($size, 1024)))), $precision) . ' ' . $unit[$i];
     }
 
-    function getElapsedTime(int $decimals = 2)
+    public function getElapsedTime(int $decimals = 2)
     {
         return number_format(microtime(true) - request()->server('REQUEST_TIME_FLOAT'), $decimals) . ' s';
     }

app/Listeners/ConponCallbackListener.php

@@ -56,6 +56,7 @@ class ConponCallbackListener implements ShouldQueue
                 $data['remark'] = '接口错误';
                 $error          = true;
             }
+
             ActivityCouponLog::create($data);
 
             if ($error) {

app/Models/Activity.php

@@ -100,8 +100,8 @@ class Activity extends Model
     {
 
         try {
-            $code = 'YSD' . date('ymd') . mt_rand(100000, 999999);
-
+            //            $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);

app/Models/ActivityCoupon.php

@@ -64,4 +64,26 @@ class ActivityCoupon extends Model
         return $this->canRedemption();
     }
 
+    /**
+     * Notes: 是否可以撤销
+     * @Author: 玄尘
+     * @Date  : 2020/10/12 11:57
+     * @return bool
+     */
+    public function canReversal()
+    {
+        return $this->status == self::STATUS_USED;
+    }
+
+    /**
+     * Notes: 撤销
+     * @Author: 玄尘
+     * @Date  : 2020/10/12 13:56
+     */
+    public function reversal()
+    {
+        $this->status = self::STATUS_INIT;
+        $this->save();
+    }
+
 }

app/Models/Coupon.php

@@ -37,6 +37,9 @@ class Coupon extends Model
             case 4:
                 return '已分润';
                 break;
+            case 5:
+                return '已撤销';
+                break;
             default:
                 return '未知状态';
                 break;
@@ -88,6 +91,45 @@ class Coupon extends Model
         }
     }
 
+    /**
+     * Notes: 撤销
+     * @Author: 玄尘
+     * @Date  : 2020/10/12 13:56
+     */
+    public function reversal()
+    {
+        $this->status = 5;
+        $this->remark = '撤销成功';
+        $this->save();
+
+        if ($this->profit > 0) {
+            return $this->user->account->rule('refreeze', -$this->profit, false, [
+                'coupon_id'      => $this->id,
+                'redemptionCode' => $this->redemptionCode,
+            ]);
+        } else {
+            return '不需要操作';
+        }
+    }
+
+    /**
+     * Notes: 撤销分润
+     * @Author: 玄尘
+     * @Date  : 2020/10/9 14:07
+     */
+    public function reprofit()
+    {
+        if ($this->profit > 1) {
+            return $this->user->account->rule('refreeze', -$this->profit, false, [
+                'coupon_id'      => $this->id,
+                'redemptionCode' => $this->redemptionCode,
+            ]);
+        } else {
+            return '不需要操作';
+        }
+
+    }
+
     /**
      * 打款
      * @author 玄尘 2020-03-13

app/Models/Log.php

@@ -40,9 +40,9 @@ class Log extends Model
             Schema::create($this->table, function (Blueprint $table) {
                 $table->increments('id');
                 $table->string('path', 255);
-                $table->string('method', 15)->index();
+                $table->string('method', 15);
                 $table->text('in_source');
-                $table->string('type', 20)->index();
+                $table->string('type', 20);
                 $table->text('out_source')->nullable();
                 $table->timestamps();
             });

app/Models/PinganToken.php

@@ -1,8 +1,10 @@
 <?php
+
 namespace App\Models;
 
 class PinganToken extends Model
 {
+
     protected $dates = [
         'get_token_time',
     ];

app/Models/UnionpayLog.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Models;
+
+class UnionpayLog extends Model
+{
+
+    protected $casts = [
+        'in_source'  => 'array',
+        'out_source' => 'array',
+    ];
+
+    const STATUS_SUCCESS = 1;
+    const STATUS_ERROR   = 0;
+    const STATUS         = [
+        self::STATUS_SUCCESS => '成功',
+        self::STATUS_ERROR   => '失败',
+    ];
+
+    public function coupon()
+    {
+        return $this->hasOne(Coupon::class, 'redemptionCode', 'mkt_code');
+    }
+
+}

app/Models/User.php

@@ -16,14 +16,12 @@ class User extends Authenticatable
 
     /**
      * The attributes that are mass assignable.
-     *
      * @var array
      */
     protected $guarded = [];
 
     /**
      * The attributes that should be hidden for arrays.
-     *
      * @var array
      */
     protected $hidden = [
@@ -91,7 +89,7 @@ class User extends Authenticatable
     /**
      * Notes: 密码加密
      * @Author: <C.Jason>
-     * @Date: 2019/9/6 11:37
+     * @Date  : 2019/9/6 11:37
      * @param $password
      */
     protected function setPasswordAttribute($password)

app/Models/UserCode.php

@@ -4,8 +4,10 @@ namespace App\Models;
 
 class UserCode extends Model
 {
+
     protected $casts = [
         'codes'  => 'array',
         'profit' => 'array',
     ];
+
 }

app/Models/UserInfo.php

@@ -14,7 +14,7 @@ class UserInfo extends Model
     /**
      * Notes: 获取性别的文字显示
      * @Author: <C.Jason>
-     * @Date: 2019/9/12 09:46
+     * @Date  : 2019/9/12 09:46
      * @return string
      */
     protected function getSexTextAttribute()
@@ -35,7 +35,7 @@ class UserInfo extends Model
     /**
      * Notes: 处理默认头像
      * @Author: <C.Jason>
-     * @Date: 2019/9/12 13:44
+     * @Date  : 2019/9/12 13:44
      * @param $avatar
      * @return string
      */

app/Models/UserPingan.php

@@ -6,6 +6,6 @@ use App\Models\Traits\BelongsToUser;
 
 class UserPingan extends Model
 {
-    use BelongsToUser;
 
+    use BelongsToUser;
 }

app/Models/WoCouponLog.php

@@ -4,8 +4,10 @@ namespace App\Models;
 
 class WoCouponLog extends Model
 {
+
     public function coupon()
     {
         return $this->belongsTo(WoCoupon::class, 'wo_coupon_id', 'id');
     }
+
 }

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' => 
@@ -89,15 +89,11 @@
       0 => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider',
     ),
   ),
-  'overtrue/laravel-wechat' => 
+  'overtrue/laravel-query-logger' => 
   array (
     'providers' => 
     array (
-      0 => 'Overtrue\\LaravelWeChat\\ServiceProvider',
-    ),
-    'aliases' => 
-    array (
-      'EasyWeChat' => 'Overtrue\\LaravelWeChat\\Facade',
+      0 => 'Overtrue\\LaravelQueryLogger\\ServiceProvider',
     ),
   ),
   'simplesoftwareio/simple-qrcode' => 
@@ -111,4 +107,18 @@
       'QrCode' => 'SimpleSoftwareIO\\QrCode\\Facades\\QrCode',
     ),
   ),
+  'xuanchen/coupon' => 
+  array (
+    'providers' => 
+    array (
+      0 => 'XuanChen\\Coupon\\ServiceProvider',
+    ),
+  ),
+  'xuanchen/unionpay' => 
+  array (
+    'providers' => 
+    array (
+      0 => 'XuanChen\\UnionPay\\ServiceProvider',
+    ),
+  ),
 );

bootstrap/cache/services.php

@@ -23,7 +23,7 @@
     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',
     25 => 'Fideloper\\Proxy\\TrustedProxyServiceProvider',
@@ -33,14 +33,16 @@
     29 => 'Maatwebsite\\Excel\\ExcelServiceProvider',
     30 => 'Carbon\\Laravel\\ServiceProvider',
     31 => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider',
-    32 => 'Overtrue\\LaravelWeChat\\ServiceProvider',
+    32 => 'Overtrue\\LaravelQueryLogger\\ServiceProvider',
     33 => 'SimpleSoftwareIO\\QrCode\\QrCodeServiceProvider',
-    34 => 'App\\Providers\\AppServiceProvider',
-    35 => 'App\\Providers\\AuthServiceProvider',
-    36 => 'App\\Providers\\EventServiceProvider',
-    37 => 'App\\Providers\\RouteServiceProvider',
-    38 => 'App\\Api\\ApiServiceProvider',
-    39 => 'App\\Merchant\\MerchantServiceProvider',
+    34 => 'XuanChen\\Coupon\\ServiceProvider',
+    35 => 'XuanChen\\UnionPay\\ServiceProvider',
+    36 => 'App\\Providers\\AppServiceProvider',
+    37 => 'App\\Providers\\AuthServiceProvider',
+    38 => 'App\\Providers\\EventServiceProvider',
+    39 => 'App\\Providers\\RouteServiceProvider',
+    40 => 'App\\Api\\ApiServiceProvider',
+    41 => 'App\\Merchant\\MerchantServiceProvider',
   ),
   'eager' => 
   array (
@@ -54,7 +56,7 @@
     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',
     13 => 'Fideloper\\Proxy\\TrustedProxyServiceProvider',
@@ -64,14 +66,16 @@
     17 => 'Maatwebsite\\Excel\\ExcelServiceProvider',
     18 => 'Carbon\\Laravel\\ServiceProvider',
     19 => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider',
-    20 => 'Overtrue\\LaravelWeChat\\ServiceProvider',
+    20 => 'Overtrue\\LaravelQueryLogger\\ServiceProvider',
     21 => 'SimpleSoftwareIO\\QrCode\\QrCodeServiceProvider',
-    22 => 'App\\Providers\\AppServiceProvider',
-    23 => 'App\\Providers\\AuthServiceProvider',
-    24 => 'App\\Providers\\EventServiceProvider',
-    25 => 'App\\Providers\\RouteServiceProvider',
-    26 => 'App\\Api\\ApiServiceProvider',
-    27 => 'App\\Merchant\\MerchantServiceProvider',
+    22 => 'XuanChen\\Coupon\\ServiceProvider',
+    23 => 'XuanChen\\UnionPay\\ServiceProvider',
+    24 => 'App\\Providers\\AppServiceProvider',
+    25 => 'App\\Providers\\AuthServiceProvider',
+    26 => 'App\\Providers\\EventServiceProvider',
+    27 => 'App\\Providers\\RouteServiceProvider',
+    28 => 'App\\Api\\ApiServiceProvider',
+    29 => 'App\\Merchant\\MerchantServiceProvider',
   ),
   'deferred' => 
   array (

composer.json

@@ -9,6 +9,7 @@
     "license": "MIT",
     "require": {
         "php": "^7.2",
+        "barryvdh/laravel-debugbar": "^3.4",
         "encore/laravel-admin": "^1.8",
         "fideloper/proxy": "^4.0",
         "guzzlehttp/guzzle": "^7.0",
@@ -20,13 +21,16 @@
         "php-parallel-lint/php-console-color": "^0.3.0",
         "php-parallel-lint/php-console-highlighter": "^0.5.0",
         "predis/predis": "^1.1",
-        "simplesoftwareio/simple-qrcode": "^2.0"
+        "simplesoftwareio/simple-qrcode": "^2.0",
+        "xuanchen/coupon": "^1.01",
+        "xuanchen/unionpay": "^1.1"
     },
     "require-dev": {
         "facade/ignition": "^1.4",
         "fzaninotto/faker": "^1.4",
         "mockery/mockery": "^1.0",
         "nunomaduro/collision": "^3.0",
+        "overtrue/laravel-query-logger": "^2.0",
         "phpunit/phpunit": "^8.0"
     },
     "config": {
@@ -43,11 +47,11 @@
         "psr-4": {
             "App\\": "app/",
             "RuLong\\Bonus\\": "packages/bonus/src/",
-            "RuLong\\Identity\\": "packages/identity/src/",
-            "XuanChen\\Coupon\\": "packages/coupon/src/"
+            "RuLong\\Identity\\": "packages/identity/src/"
         },
         "classmap": [
             "database/seeds",
+            "database/migrations",
             "database/factories"
         ]
     },

config/coupon.php

@@ -1,15 +0,0 @@
-<?php
-
-return [
-    'rules'         => [
-        'pingan' => [
-            'pattern' => '/^\d{12}$/',
-            'model'   => App\Facades\SelfCoupon\Action\PinganAction::class,
-        ],
-        'ysd'    => [
-            'pattern' => '/^YSD/',
-            'model'   => App\Facades\SelfCoupon\Action\YsdAction::class,
-        ],
-    ],
-    'check_minutes' => 3,//统一门店同一金额  3 分钟内视为同一订单
-];

config/logging.php

@@ -96,5 +96,12 @@ return [
             'handler' => NullHandler::class,
         ],
     ],
+    'query'    => [
+        'enabled'     => env('LOG_QUERY', false),
+
+        // Only record queries that are slower than the following time
+        // Unit: milliseconds
+        'slower_than' => 0,
+    ],
 
 ];

config/sinopec.php

@@ -0,0 +1,42 @@
+<?php
+
+return [
+    /**
+     * 平安接口参数
+     */
+    'this_type' => 'dev',
+    /**
+     * 测试环境参数
+     */
+    'test'      => [
+        'client_id'     => 'P_YISHIDAI',
+        'grant_type'    => 'client_credentials',
+        'client_secret' => 'zGg9e6J5',
+        'userName'      => '18804518018',
+        'AES_CODE'      => '61DA0376BEBCFE1F',
+        'tokenUri'      => 'https://test-api.pingan.com.cn:20443/oauth/oauth2/access_token',
+        'Uri'           => 'http://test-api.pingan.com.cn:20080/open/vassPartner/appsvr/property/api/new/',
+    ],
+
+    /**
+     * 生产环境参数
+     */
+    'dev'       => [
+        'client_id'     => 'P_YISHIDAI',
+        'grant_type'    => 'client_credentials',
+        'client_secret' => 'F3j5J7bx',
+        'userName'      => '13936166646',
+        'AES_CODE'      => '108DD27AB83252DB',
+        'tokenUri'      => 'http://api.pingan.com.cn/oauth/oauth2/access_token',
+        'Uri'           => 'http://api.pingan.com.cn/open/vassPartner/appsvr/property/api/new/',
+    ],
+
+    'coupon_status' => [
+        1 => '新建',
+        2 => '未生效',
+        3 => '生效',
+        4 => '失效',
+        5 => '过期',
+    ],
+
+];

config/xuanchen_coupon.php

@@ -4,10 +4,13 @@ return [
     'coupon_model' => \App\Models\Coupon::class,
     'rules'        => [
         'ysd'      => [
-            //            'pattern' => '/^YSD\d{12}/',
             'pattern' => '/^YSD/',
             'model'   => \XuanChen\Coupon\Action\YsdAction::class,
         ],
+        'unionpay' => [
+            'pattern' => '/^66406/',
+            'model'   => \XuanChen\Coupon\Action\YsdAction::class,
+        ],
         'pingan'   => [
             'pattern' => '/^\d{12}$/',
             'model'   => \XuanChen\Coupon\Action\PinganAction::class,
@@ -15,3 +18,4 @@ return [
 
     ],
 ];
+

packages/coupon/composer.json

@@ -1,27 +0,0 @@
-{
-    "name": "xuanchen/coupon",
-    "description": "卡券相关",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "玄尘",
-            "email": "122383162@qq.com"
-        }
-    ],
-    "require": {
-        "php": ">=7.1.3",
-        "laravel/framework": "*"
-    },
-    "autoload": {
-        "psr-0": {
-            "XuanChen\\Coupon": "src/"
-        }
-    },
-    "extra": {
-        "laravel": {
-            "providers": [
-                "XuanChen\\Coupon\\ServiceProvider"
-            ]
-        }
-    }
-}

packages/coupon/config/xuanchen_coupon.php

@@ -1,15 +0,0 @@
-<?php
-
-return [
-    'coupon_model' => \App\Models\Coupon::class,
-    'rules'        => [
-        'pingan' => [
-            'pattern' => '/^\d{12}$/',
-            'model'   => \XuanChen\Coupon\Action\PinganAction::class,
-        ],
-        'ysd'    => [
-            'pattern' => '/^YSD/',
-            'model'   => \XuanChen\Coupon\Action\YsdAction::class,
-        ],
-    ],
-];

packages/coupon/src/Action/Init.php

@@ -1,197 +0,0 @@
-<?php
-
-namespace XuanChen\Coupon\Action;
-
-use App\Models\Coupon;
-use App\Models\Log as LogModel;
-
-class Init
-{
-
-    //渠道
-    public $user;
-
-    //卡券编号
-    public $redemptionCode;
-
-    //订单金额
-    public $total;
-
-    //网点编号
-    public $outletId;
-
-    //活动id
-    public $activityId;
-
-    //手机号
-    public $mobile;
-
-    //核销的卡券 创建的核销记录
-    public $coupon;
-
-    //查询返回卡券信息
-    public $query_coupon;
-
-    //订单id
-    public $orderid;
-
-    //查询到的卡券规则和商品id 只有平安券才有
-    public $queryData;
-
-    //设置渠道
-    public function setUser($user)
-    {
-        $this->user = $user;
-
-        return $this;
-    }
-
-    //设置渠道
-    public function setOrderId($orderid)
-    {
-        $this->orderid = $orderid;
-
-        return $this;
-    }
-
-    //设置核销码
-    public function setCode($redemptionCode)
-    {
-        $this->redemptionCode = $redemptionCode;
-
-        return $this;
-
-    }
-
-    //设置订单总额
-    public function setTotal($total)
-    {
-        $this->total = $total;
-
-        return $this;
-
-    }
-
-    //设置网点id
-    public function setOutletId($outletId)
-    {
-        $this->outletId = $outletId;
-
-        return $this;
-
-    }
-
-    //设置活动id
-    public function setActivityId($activityId)
-    {
-        $this->activityId = $activityId;
-
-        return $this;
-
-    }
-
-    //设置手机号
-    public function setMobile($mobile)
-    {
-        $this->mobile = $mobile;
-
-        return $this;
-
-    }
-
-    /**
-     * Notes: 插入日志
-     * @Author: 玄尘
-     * @Date  : 2020/6/30 10:29
-     * @param        $url
-     * @param        $method
-     * @param        $params
-     * @param string $type
-     * @return mixed
-     */
-    public function createLog($url, $method, $params, $type = 'pingan')
-    {
-        $data = [
-            'path'      => $url,
-            'method'    => $method,
-            'type'      => $type,
-            'in_source' => $params,
-        ];
-
-        $info = LogModel::create($data);
-
-        return $info;
-    }
-
-    /**
-     * Notes: 更新日志
-     * @Author: 玄尘
-     * @Date  : 2020/6/30 10:29
-     * @param $log
-     * @param $params
-     */
-    public static function updateLog($log, $params)
-    {
-        $log->out_source = $params;
-        $log->save();
-    }
-
-    //统一门店 相同金额 3分钟之内看作是一笔订单
-    public function CheckCount()
-    {
-        if ($this->queryData) {
-            if (isset($this->queryData['thirdPartyGoodsId']) && $this->queryData['thirdPartyGoodsId'] == 'YSD-full0-0') {
-                return true;
-            }
-        }
-
-        if ($this->orderid) {
-            $check_count = Coupon::where('orderid', $this->orderid)
-                ->where('outletId', $this->outletId)
-                ->where('total', $this->total)
-                ->where('status', 2)
-                ->where('created_at', '>=', now()->subMinutes(3)->format('Y-m-d H:i:s'))
-                ->count();
-        } else {
-            $check_count = Coupon::where('outletId', $this->outletId)
-                ->where('total', $this->total)
-                ->where('status', 2)
-                ->where('created_at', '>=', now()->subMinutes(3)->format('Y-m-d H:i:s'))
-                ->count();
-        }
-
-        $count = floor($this->total / 100);
-
-        if ($check_count > 0) {
-//            if ($this->total < 100) {
-            //                return '核销失败，订单金额少于100只能核销一张优惠券。';
-            //            }
-            if ($check_count >= $count) {
-                return "核销失败，此订单您只能使用 {$count} 张优惠券";
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Notes: 校验是否已经核销过
-     * @Author: 玄尘
-     * @Date  : 2020/8/8 13:43
-     */
-    public function HasCheck()
-    {
-        $info = Coupon::where('redemptionCode', $this->redemptionCode)
-            ->where('outletId', $this->outletId)
-            ->where('total', $this->total)
-            ->where('status', 2)
-            ->first();
-        if ($info) {
-            return '核销失败，此优惠券已被使用';
-        }
-
-        return false;
-
-    }
-
-}

packages/coupon/src/Action/PinganAction.php

@@ -1,55 +0,0 @@
-<?php
-
-namespace XuanChen\Coupon\Action;
-
-use XuanChen\Coupon\Action\pingan\Query;
-use XuanChen\Coupon\Action\pingan\Verification;
-use XuanChen\Coupon\Contracts\CouponContracts;
-
-class PinganAction extends Init implements CouponContracts
-{
-
-    /**
-     * Notes: 核销执行入口
-     * @Author: 玄尘
-     * @Date  : 2020/6/29 14:49
-     * @return mixed
-     */
-    public function start()
-    {
-        return (new Verification)->setCode($this->redemptionCode)
-                                 ->setUser($this->user)
-                                 ->setOutletId($this->outletId)
-                                 ->setTotal($this->total)
-                                 ->setOrderId($this->orderid)
-                                 ->start();
-    }
-
-    /**
-     * Notes: 查询卡券详情
-     * @Author: 玄尘
-     * @Date  : 2020/6/29 15:15
-     * @return mixed
-     */
-    public function detail()
-    {
-        $info = (new Query)->setOutletId($this->outletId)
-                           ->setCode($this->redemptionCode)
-                           ->start();
-
-        return $info;
-    }
-
-    //发券
-    function grant()
-    {
-        return '没这个接口';
-    }
-
-    //作废
-    function destroy()
-    {
-        return '没这个接口';
-    }
-
-}

packages/coupon/src/Action/YsdAction.php

@@ -1,91 +0,0 @@
-<?php
-
-namespace XuanChen\Coupon\Action;
-
-use XuanChen\Coupon\Action\ysd\YsdDestroy;
-use XuanChen\Coupon\Action\ysd\YsdGrant;
-use XuanChen\Coupon\Action\ysd\YsdQuery;
-use XuanChen\Coupon\Action\ysd\YsdVerification;
-use XuanChen\Coupon\Contracts\CouponContracts;
-
-/**
- * Class YsdAction 自有卡券核销
- * @Author  : 玄尘
- * @Date    : 2020/7/21 9:41
- * @package XuanChen\Coupon\Action
- */
-class YsdAction extends Init implements CouponContracts
-{
-
-    /**
-     * Notes: 发券
-     * @Author: 玄尘
-     * @Date  : 2020/7/21 10:08
-     * @return mixed
-     */
-    public function grant()
-    {
-        return (new YsdGrant)->setActivityId($this->activityId)
-                             ->setOutletId($this->outletId)
-                             ->setMobile($this->mobile)
-                             ->start();
-    }
-
-    /**
-     * Notes: 查询卡券详情
-     * @Author: 玄尘
-     * @Date  : 2020/6/29 15:15
-     * @return mixed
-     */
-    public function detail()
-    {
-        $query_coupon = (new YsdQuery)->setOutletId($this->outletId)
-                                      ->setCode($this->redemptionCode)
-                                      ->start();
-
-        if (!is_string($query_coupon)) {
-            return [
-                'name'      => $query_coupon->activity->title,
-                'code'      => $query_coupon->code,
-                'full'      => $query_coupon->full,
-                'price'     => $query_coupon->price,
-                'status'    => $query_coupon->status,
-                'used_at'   => (string)$query_coupon->used_at,
-                'startTime' => (string)$query_coupon->start_at,
-                'endTime'   => (string)$query_coupon->end_at,
-
-            ];
-        }
-
-        return $query_coupon;
-    }
-
-    /**
-     * Notes: 作废
-     * @Author: 玄尘
-     * @Date  : 2020/7/21 11:32
-     */
-    public function destroy()
-    {
-        return $res = (new YsdDestroy)->setCode($this->redemptionCode)
-                                      ->setOutletId($this->outletId)
-                                      ->start();
-    }
-
-    /**
-     * Notes: 核销执行入口
-     * @Author: 玄尘
-     * @Date  : 2020/6/29 14:49
-     * @return mixed
-     */
-    public function start()
-    {
-        return $res = (new YsdVerification)->setCode($this->redemptionCode)
-                                           ->setUser($this->user)
-                                           ->setOutletId($this->outletId)
-                                           ->setTotal($this->total)
-                                           ->setOrderId($this->orderid)
-                                           ->start();
-    }
-
-}

packages/coupon/src/Action/pingan/PingAnInit.php

@@ -1,205 +0,0 @@
-<?php
-
-namespace XuanChen\Coupon\Action\pingan;
-
-use App\Models\PinganToken;
-use GuzzleHttp\Client;
-use GuzzleHttp\Exception\RequestException;
-use XuanChen\Coupon\Action\Init;
-
-/**
- * 超市购物券
- */
-class PingAnInit extends Init
-{
-
-    protected $this_type;
-
-    protected $baseUri;
-
-    protected $tokenUri;
-
-    protected $client_id;
-
-    protected $grant_type;
-
-    protected $client_secret;
-
-    protected $access_token;
-
-    protected $userName;
-
-    protected $error;
-
-    protected $aes_code; //aes 密钥
-
-    protected $log;//日志
-
-    public function __construct()
-    {
-        $this->this_type = config('pingan.this_type');
-        $pingan          = config('pingan.' . $this->this_type);
-
-        $this->baseUri       = $pingan['Uri'];
-        $this->tokenUri      = $pingan['tokenUri'];
-        $this->client_id     = $pingan['client_id'];
-        $this->grant_type    = $pingan['grant_type'];
-        $this->userName      = $pingan['userName'];
-        $this->client_secret = $pingan['client_secret'];
-        $this->aes_code      = $pingan['AES_CODE'];
-    }
-
-    /**
-     * 获取access_token
-     * @return void [type] [description]
-     */
-    public function getToken()
-    {
-        //从数据库里找token
-        $token = PinganToken::where('type', $this->this_type)->orderBy('id', 'desc')->first();
-
-        if ($token) {
-            $access_token   = $token->access_token;
-            $expires_in     = $token->expires_in;
-            $get_token_time = $token->get_token_time;
-            $diffMinutes    = $get_token_time->diffInMinutes(now(), false);
-            if ($diffMinutes < $expires_in) {
-                $this->access_token = $access_token;
-            } else {
-                $this->getAjaxToken();
-            }
-        } else {
-            $this->getAjaxToken();
-        }
-    }
-
-    /**
-     * 获取毫秒级别的时间戳
-     */
-    public function getMsecTime()
-    {
-        [$msec, $sec] = explode(' ', microtime());
-        $msectime = (float)sprintf('%.0f', (floatval($msec) + floatval($sec)) * 1000);
-        $msectime = explode('.', $msectime);
-
-        return $msectime[0];
-    }
-
-    /**
-     * 请求平台 access_token
-     * @return void [type] [description]
-     */
-    public function getAjaxToken()
-    {
-        $params = [
-            'client_id'     => $this->client_id,
-            'grant_type'    => $this->grant_type,
-            'client_secret' => $this->client_secret,
-        ];
-
-        try {
-            $log = $this->createLog($this->tokenUri, 'POST', $params, 'pingan');
-
-            $client   = new Client();
-            $response = $client->request('POST', $this->tokenUri, [
-                'form_params' => $params,
-            ]);
-            $body     = $response->getBody();
-            $content  = $body->getContents();
-            $result   = json_decode($content, true);
-
-            $this->updateLog($log, $result); //更新日志
-
-            if ($result['ret'] > 0) {
-                $this->error = $result['msg'];
-            } else {
-                $data = $result['data'];
-                PinganToken::create([
-                    'type'           => $this->this_type,
-                    'access_token'   => $data['access_token'],
-                    'expires_in'     => $data['expires_in'],
-                    'get_token_time' => now(),
-                ]);
-                $this->access_token = $data['access_token'];
-                $this->error        = '';
-            }
-        } catch (RequestException $e) {
-            $this->error = $e->getMessage();
-            $this->updateLog($log, [$this->error]); //更新日志
-        }
-
-    }
-
-    /**
-     * 通用获取数据接口
-     * @param  [type] $url    请求地址
-     * @param array  $query  传递参数
-     * @param array  $json   需要传的json数据
-     * @param string $method 方式
-     * @return array|mixed [type]         [description]
-     */
-    public function getPingAnData($url, $query = [], $json = [], $method = 'POST')
-    {
-        $this->getToken();
-
-        if ($this->error) {
-            return $this->error;
-        }
-
-        $postData = [
-            'query'   => array_merge([
-                'access_token' => $this->access_token,
-                'request_id'   => $this->getMsecTime(),
-                'userName'     => $this->userName,
-            ], $query),
-            'json'    => $json,
-            'headers' => [
-                'Content-Type' => 'application/json;charset=utf-8',
-                'accept'       => 'application/json;charset=utf-8',
-            ],
-        ];
-
-        $log = $this->createLog($url, $method, $postData, 'pingan'); //日志
-
-        try {
-            $client   = new Client();
-            $response = $client->request($method, $url, $postData);
-            $body     = $response->getBody();
-            $content  = $body->getContents();
-            $result   = json_decode($content, true);
-
-            if ($result['ret'] > 0) {
-                $retData = $result['msg'];
-            } else {
-                $retData = $result['data'];
-            }
-            $this->updateLog($log, $retData);//更新日志
-
-            return $retData;
-        } catch (RequestException $e) {
-            $this->updateLog($log, [$e->getMessage()]);//更新日志
-
-            return ['ret' => '99999', $e->getMessage()];
-        }
-    }
-
-    //加密
-    public function encrypt($str)
-    {
-        if (is_array($str)) {
-            $str = json_encode($str);
-        }
-        $data = openssl_encrypt($str, 'aes-128-ecb', $this->aes_code, OPENSSL_RAW_DATA);
-
-        return base64_encode($data);
-    }
-
-    //解密
-    public function decrypt($str)
-    {
-        $encrypted = base64_decode($str);
-
-        return openssl_decrypt($encrypted, 'aes-128-ecb', $this->aes_code, OPENSSL_RAW_DATA);
-    }
-
-}

packages/coupon/src/Action/pingan/Query.php

@@ -1,45 +0,0 @@
-<?php
-
-namespace XuanChen\Coupon\Action\pingan;
-
-use App\Models\User;
-
-class Query extends PingAnInit
-{
-
-    public function start()
-    {
-
-        try {
-            //查询网点是否存在
-            $outlet = User::where('outlet_id', $this->outletId)->first();
-
-            if (!$outlet) {
-                throw new \Exception('网点编号错误，未查询到网点信息');
-            }
-
-            $url    = $this->baseUri . 'partner/v2/coupondetail';
-            $params = [
-                'redemptionCode' => $this->redemptionCode,
-                'outletNo'       => $outlet->PaOutletId,
-                'thirdOutletNo'  => $outlet->outlet_id,
-            ];
-
-            $res = $this->getPingAnData($url, $params);
-
-            if (!is_array($res)) {
-                throw new \Exception($res);
-            }
-
-            if ($res['code'] != 200) {
-                throw new \Exception($res['message']);
-            }
-
-            return collect($res['data']);
-        } catch (\Exception $e) {
-            return $e->getMessage();
-        }
-
-    }
-
-}

packages/coupon/src/Action/pingan/Verification.php

@@ -1,298 +0,0 @@
-<?php
-
-namespace XuanChen\Coupon\Action\pingan;
-
-use App\Models\Coupon;
-use App\Models\User;
-use Carbon\Carbon;
-
-class Verification extends PingAnInit
-{
-
-    public $ticket;
-
-    public function start()
-    {
-        //检查是否已经核销过
-        $res = $this->HasCheck();
-        if ($res !== false) {
-            return $res;
-        }
-
-        //查询卡券信息
-        $this->query_coupon = (new Query)->setOutletId($this->outletId)
-            ->setCode($this->redemptionCode)
-            ->start();
-        if (is_string($this->query_coupon)) {
-            return $this->query_coupon;
-        }
-
-        //校验卡券
-        $ticket = $this->checkCoupon();
-        if (!is_array($ticket)) {
-            return $ticket;
-        }
-
-        //检查可核销次数
-        $ret = $this->CheckCount();
-        if ($ret !== true) {
-            return $ret;
-        }
-
-        //增加核销记录
-        $coupon = $this->AddCoupon();
-        if (is_string($coupon)) {
-            return $coupon;
-        }
-
-        try {
-            $params = [
-                'couponNo'       => $coupon->redemptionCode,
-                'partnerOrderId' => date('ymdHis') . sprintf("%0" . strlen(999999) . "d", mt_rand(0, 999999)),
-                'outletId'       => $coupon->PaOutletId,
-                'productId'      => $coupon->productId,
-                'timestamp'      => $this->getMsecTime(),
-            ];
-
-            $url = $this->baseUri . 'partner/redemption';
-            $str = $this->encrypt($params);
-            $res = $this->getPingAnData($url, [], ['data' => $str]);
-
-            if (!is_array($res)) {
-                $coupon->remark = $res;
-                $coupon->status = 3;
-                $coupon->save();
-                throw new \Exception($res);
-            }
-
-            if ($res['code'] != 200) {
-                $coupon->remark = $res['code'] . '--' . $res['message'];
-                $coupon->status = 3;
-                $coupon->save();
-                throw new \Exception($res['message']);
-            }
-
-            $data = $res['data'];
-
-            $coupon->remark = $data['message'];
-            $coupon->status = ($data['status'] == 1) ? 2 : 3;
-            $coupon->save();
-
-            //返回的数据
-            $resdata = [
-                'price' => $coupon->price,
-                'name'  => $coupon->couponName,
-                'total' => $coupon->total,
-            ];
-
-            //核销成功 执行分润
-            $coupon->profit();
-
-            return $resdata;
-
-        } catch (Exception $e) {
-            $coupon->status = 3;
-            $coupon->remark = '核销失败 ' . $e->getMessage();
-            $coupon->save();
-
-            return $coupon->remark;
-        }
-
-    }
-
-    /**
-     * Notes: 如可核销记录
-     * @Author: 玄尘
-     * @Date  : 2020/7/21 15:03
-     * @return string
-     */
-    public function AddCoupon()
-    {
-        try {
-            $couponData = [
-                'user_id'           => $this->user->id,
-                'type'              => Coupon::TYPE_PINGAN,
-                'outletId'          => $this->outletId,
-                'orderid'           => $this->orderid,
-                'PaOutletId'        => $this->queryData['PaOutletId'],
-                'redemptionCode'    => $this->redemptionCode,
-                'productId'         => $this->queryData['productId'],
-                'thirdPartyGoodsId' => $this->queryData['thirdPartyGoodsId'],
-                'couponName'        => $this->query_coupon['couponName'],
-                'price'             => $this->ticket['price'],
-                'total'             => $this->total,
-                'profit'            => $this->ticket['profit'],
-                'status'            => 0,
-                'startTime'         => $this->query_coupon['startTime'],
-                'endTime'           => $this->query_coupon['endTime'],
-            ];
-
-            return $coupon = Coupon::create($couponData);
-
-        } catch (Exception $e) {
-            return $e->getMessage();
-        }
-
-    }
-
-    /**
-     * Notes: 检查卡券信息
-     * @Author: 玄尘
-     * @Date  : 2020/6/29 16:40
-     * @return string
-     */
-    public function checkCoupon()
-    {
-
-        //检查卡券是否已被核销
-        if ($this->query_coupon['status'] > 0) {
-            if (isset(config('pingan.coupon_status')[$this->query_coupon['status']])) {
-                return '核销失败，平安券' . config('pingan.coupon_status')[$this->query_coupon['status']];
-            }
-
-            return '核销失败，平安券不可用。';
-        }
-
-        $startTime = Carbon::parse($this->query_coupon['startTime']);
-        $endTime   = Carbon::parse($this->query_coupon['endTime']);
-        $now       = now();
-
-        if ($startTime->gt($now)) {
-            return '核销失败，平安券未开始使用。';
-        }
-
-        if ($now->gt($endTime)) {
-            return '核销失败，平安券已过期。';
-        }
-
-        //查找适配的商品id 和 网点id
-        $pinganData = $this->getPinganProduct();
-
-        if (is_string($pinganData)) {
-            return $pinganData;
-        }
-
-        //获取相关优惠信息
-        return $this->checkCode();
-
-    }
-
-    /**
-     * 校验平安券编号
-     * @return array|string [type]                 [description]
-     */
-    public function checkCode()
-    {
-        $code = $this->user->code->where('code', $this->queryData['thirdPartyGoodsId'])->first();
-        if (!$code) {
-            return "核销失败，未找到此项平安券规则,请联系管理人员检查渠道配置。";
-        }
-
-        $ticket = explode('-', $this->queryData['thirdPartyGoodsId']);
-
-        if (!is_array($ticket) || count($ticket) != 3) {
-            return "核销失败，平安券规则格式不正确。";
-        }
-
-        $full  = $ticket[1]; //full100
-        $price = $ticket[2];
-        preg_match('/\d+/', $full, $result);
-
-        if (empty($result) || !is_array($result)) {
-            return "核销失败，平安券规则格式不正确。";
-        }
-
-        if (!is_numeric($this->total)) {
-            return "核销失败，订单金额必须是数字";
-        }
-        if ($result[0] > $this->total) {
-            return '核销失败，订单金额不足，平安券不可使用。';
-        }
-
-        $this->ticket = [
-            'total'  => $result[0],
-            'price'  => $price,
-            'profit' => $code->profit,
-        ];
-
-        return $this->ticket;
-    }
-
-    /**
-     * 查找平安商品id
-     * @author 玄尘 2020-04-04
-     * @return array|string [type]       [description]
-     */
-    public function getPinganProduct()
-    {
-        //查询网点是否存在
-        $outlet = User::where('outlet_id', $this->outletId)->first();
-
-        if (!$outlet) {
-            return '核销失败，网点编号错误，未查询到网点信息';
-        }
-
-        $PaOutletId             = $outlet->PaOutletId;
-        $outlet_id              = $outlet->outlet_id;
-        $profitOfferItemVersion = $this->query_coupon['profitOfferItemVersion'];
-
-        if (!$PaOutletId && $profitOfferItemVersion != 1) {
-            return '核销失败，参数错误，渠道信息缺少平安网点id';
-        }
-
-        $productItemList = $this->query_coupon['productItemList'];
-
-        if (!is_array($productItemList) || !is_array($productItemList[0])) {
-            return '核销失败，平安券数据有误，可能是未配置网点。';
-        }
-
-        //循环查找
-        $first = '';
-        foreach ($productItemList as $key => $item) {
-            $productId         = $item['productId'];
-            $thirdPartyGoodsId = $item['thirdPartyGoodsId'];
-            $outletList        = $item['outletList'];
-            if (!is_array($outletList) || !is_array($outletList[0])) {
-                return '核销失败，网点信息有误！请检查平安券配置信息。';
-                break;
-            }
-
-            $outletList = collect($outletList);
-            //判断是新版还是旧版
-            if ($profitOfferItemVersion) {
-                //新版通过第三方查询
-                $first = $outletList->firstWhere('thirdOutletNo', $outlet_id);
-
-                if ($first) {
-                    break;
-                }
-            } else {
-                //旧版通过平安网点查询
-                $first = $outletList->firstWhere('outletNo', $PaOutletId);
-                if ($first) {
-                    break;
-                }
-            }
-        }
-
-        if (!$first) {
-            return '核销失败，未找到可用网点信息。';
-        }
-
-        if (!$thirdPartyGoodsId) {
-            return '核销失败，平安券编号规则有误。';
-        }
-
-        if (!$productId) {
-            return '核销失败，未查询到平安券商品id。';
-        }
-
-        return $this->queryData = [
-            'thirdPartyGoodsId' => $thirdPartyGoodsId,
-            'productId'         => $productId,
-            'PaOutletId'        => $first['outletNo'],
-        ];
-
-    }
-
-}

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

@@ -1,61 +0,0 @@
-<?php
-
-namespace XuanChen\Coupon\Action\ysd;
-
-use App\Events\ConponCallback;
-use App\Models\ActivityCoupon;
-use App\Models\User;
-use XuanChen\Coupon\Action\Init;
-
-class YsdDestroy extends Init
-{
-
-    public function start()
-    {
-        if ($this->redemptionCode) {
-            try {
-                if (!$this->outletId) {
-                    throw new \Exception('缺少网点id');
-                }
-
-                $info = ActivityCoupon::where('code', $this->redemptionCode)->first();
-
-                if (!$info) {
-                    throw new \Exception('未查询到卡券信息');
-                }
-
-                $outlet = User::where('outlet_id', $this->outletId)->first();
-
-                if (empty($outlet)) {
-                    return '作废失败,未查询到此网点信息。';
-                }
-
-                $grants = $info->activity->grants()->pluck('user_id');
-                if ($grants->isEmpty()) {
-                    return '作废失败，此活动还没有配置可发券渠道，请联系相关人员进行配置。';
-                }
-
-                if (!in_array($outlet->parent_id, $grants->toArray())) {
-                    return '作废失败，您没有权限作废此优惠券。';
-                }
-
-                if (!$info->canDestroy()) {
-                    throw new \Exception('作废失败，' . $info->status_text . '不能操作');
-                }
-
-                $info->status = ActivityCoupon::STATUS_CLOSE;
-                $info->save();
-
-                event(new ConponCallback($info));
-
-                return true;
-            } catch (\Exception $e) {
-                return $e->getMessage();
-            }
-        } else {
-            return '未获取到券码。';
-        }
-
-    }
-
-}

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

@@ -1,68 +0,0 @@
-<?php
-
-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
-{
-
-    public function start()
-    {
-        try {
-
-            $activity = Activity::withCount('coupons')->where('code', $this->activityId)->first();
-            if (!$activity) {
-                return '发券失败,没有找到这个活动。';
-            }
-
-            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) {
-                return '发券失败,未查询到此网点信息。';
-            }
-
-            $grants = $activity->grants()->pluck('user_id');
-            if ($grants->isEmpty()) {
-                return '发券失败，此活动还没有配置可发券渠道，请联系相关人员进行配置。';
-            }
-
-            if (!in_array($outlet->parent_id, $grants->toArray())) {
-                return '发券失败，您没有权限发此类优惠券。';
-            }
-
-            $coupon = $activity->grant($this->mobile, $this->outletId);
-
-            if (!is_string($coupon)) {
-                return [
-                    'name'      => $activity->title,
-                    'code'      => $coupon->code,
-                    'full'      => $coupon->full,
-                    'price'     => $coupon->price,
-                    'startTime' => $coupon->start_at->format('Y-m-d H:i:s'),
-                    'endTime'   => $coupon->end_at->format('Y-m-d H:i:s'),
-                ];
-            }
-
-            return $coupon;
-        } catch (\Exception $e) {
-            return $e->getMessage();
-        }
-
-    }
-
-}

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

@@ -1,51 +0,0 @@
-<?php
-
-namespace XuanChen\Coupon\Action\ysd;
-
-use App\Models\ActivityCoupon;
-use App\Models\User;
-use XuanChen\Coupon\Action\Init;
-
-class YsdQuery extends Init
-{
-
-    public function start()
-    {
-        try {
-            $info = User::where('outlet_id', $this->outletId)->first();
-
-            if (!$info) {
-                throw new \Exception('网点编号错误，未查询到网点信息');
-            }
-
-            $coupon = ActivityCoupon::where('code', $this->redemptionCode)->first();
-
-            if (!$coupon) {
-                throw new \Exception('卡券编号错误，未查询到卡券信息');
-            }
-
-            $activity = $coupon->activity;
-            if (!$activity) {
-                throw new \Exception('操作失败,未查到活动信息');
-            }
-
-            //获取所有可核销渠道
-            $verifications = $activity->verifications()->pluck('user_id');
-
-            if ($verifications->isEmpty()) {
-                throw new \Exception('操作失败，此活动还没有配置可核券渠道，请联系相关人员进行配置。');
-            }
-
-            if (!in_array($info->parent_id, $verifications->toArray())) {
-                throw new \Exception('操作失败,您没有权限查询此卡券信息。');
-            }
-
-            return $coupon;
-
-        } catch (\Exception $e) {
-            return $e->getMessage();
-        }
-
-    }
-
-}

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

@@ -1,195 +0,0 @@
-<?php
-
-namespace XuanChen\Coupon\Action\ysd;
-
-use App\Events\ConponCallback;
-use App\Models\ActivityCoupon;
-use App\Models\Coupon;
-use Illuminate\Support\Facades\DB;
-use XuanChen\Coupon\Action\Init;
-
-class YsdVerification extends Init
-{
-
-    public $ticket;
-
-    /**
-     * Notes: 核销具体流程
-     * @Author: 玄尘
-     * @Date  : 2020/7/29 13:12
-     * @return array|string
-     */
-    public function start()
-    {
-        //检查是否已经核销过
-        $res = $this->HasCheck();
-        if ($res !== false) {
-            return $res;
-        }
-
-        //查询卡券信息  返回model  返回string 说明报错
-        $this->query_coupon = (new YsdQuery)->setOutletId($this->outletId)
-                                            ->setCode($this->redemptionCode)
-                                            ->start();
-
-        if (is_string($this->query_coupon)) {
-            return $this->query_coupon;
-        }
-
-        //检查可核销次数，100元为1次。
-        if ($this->query_coupon->activity && $this->query_coupon->activity->need_check) {
-            $ret = $this->CheckCount();
-            if ($ret !== true) {
-                return $ret;
-            }
-        }
-
-        //校验卡券
-        $ticket = $this->checkCoupon();
-        if (!is_array($ticket)) {
-            return $ticket;
-        }
-
-        //增加核销记录
-        $coupon = $this->AddCoupon();
-        if (is_string($coupon)) {
-            return $coupon;
-        }
-
-        DB::beginTransaction();
-
-        try {
-            $this->query_coupon->status  = ActivityCoupon::STATUS_USED;
-            $this->query_coupon->used_at = now();
-            $this->query_coupon->save();
-
-            $this->coupon->status = 2;
-            $this->coupon->remark = '核销成功';
-            $this->coupon->save();
-            //返回的数据
-            $resdata = [
-                'name'  => $this->coupon->couponName,
-                'total' => $this->coupon->total,
-                'price' => $this->coupon->price,
-            ];
-            //核销成功 执行分润
-            $this->coupon->profit();
-            DB::commit();
-
-            event(new ConponCallback($this->query_coupon));
-
-            return $resdata;
-        } catch (Exception $e) {
-            DB::rollback();
-
-            $this->coupon->status = 3;
-            $this->coupon->remark = '核销失败 ' . $e->getMessage();
-            $this->coupon->save();
-
-            return $this->coupon->remark;
-        }
-
-    }
-
-    /**
-     * Notes: 检查卡券信息
-     * @Author: 玄尘
-     * @Date  : 2020/6/29 16:40
-     * @return string
-     */
-    public function checkCoupon()
-    {
-
-        if (!$this->query_coupon->canRedemption()) {
-            return '核销失败，优惠券不可核销';
-        }
-
-        $now = now();
-
-        if ($this->query_coupon->start_at->gt($now)) {
-            return '核销失败，卡券未到可用时间。请在' . $this->query_coupon->start_at->format('Y-m-d H:i:s') . '后使用';
-        }
-
-        if ($now->gt($this->query_coupon->end_at)) {
-            return '核销失败，卡券已过期。';
-        }
-
-        $rule_code = $this->query_coupon->activity->rule->code;
-        $code      = $this->user->code->where('code', $rule_code)->first();
-
-        if (!$code) {
-            return "核销失败，您没有权限使用此卡券优惠活动。";
-        }
-
-        $ticket = explode('-', $rule_code);
-        if (!is_array($ticket) || count($ticket) != 3) {
-            return "核销失败，卡券规则格式不正确";
-        }
-
-        $full  = $ticket[1]; //full100
-        $price = $ticket[2];
-        //        preg_match('/(\d{3}(\.\d+)?)/is', $full, $match);
-        preg_match('/\d+/', $full, $match);
-
-        if (!is_array($match)) {
-            return "核销失败，卡券规则格式不正确。";
-        }
-
-        if (!is_numeric($this->total)) {
-            return "核销失败，订单金额必须是数字";
-        }
-
-        if ($match[0] > $this->total) {
-            return '核销失败，订单金额不足。';
-        }
-
-        return $this->ticket = [
-            'total'  => $match[0],
-            'price'  => $price,
-            'profit' => $code->profit,
-        ];
-
-    }
-
-    /**
-     * Notes: 如可核销记录
-     * @Author: 玄尘
-     * @Date  : 2020/7/21 15:03
-     * @return string
-     */
-    public function AddCoupon()
-    {
-        DB::beginTransaction();
-
-        try {
-            $couponData = [
-                'user_id'           => $this->user->id,
-                'type'              => Coupon::TYPE_YSD,
-                'outletId'          => $this->outletId,
-                'orderid'           => $this->orderid,
-                'PaOutletId'        => '',
-                'redemptionCode'    => $this->redemptionCode,
-                'thirdPartyGoodsId' => $this->query_coupon->activity->rule->code,
-                'couponName'        => $this->query_coupon->activity->title,
-                'price'             => $this->ticket['price'],
-                'total'             => $this->total,
-                'profit'            => $this->ticket['profit'],
-                'status'            => $this->query_coupon->status,
-                'startTime'         => $this->query_coupon->start_at,
-                'endTime'           => $this->query_coupon->end_at,
-            ];
-
-            $this->coupon = Coupon::create($couponData);
-
-            DB::commit();
-
-            return $this->coupon;
-        } catch (Exception $e) {
-            DB::rollback();
-
-            return $e->getMessage();
-        }
-
-    }
-
-}

packages/coupon/src/Contracts/CheckCouponContracts.php

@@ -1,14 +0,0 @@
-<?php
-
-namespace XuanChen\Coupon\Contracts;
-
-interface CheckCouponContracts
-{
-
-    /**
-     * start
-     * @return [type] [description]
-     */
-    function start();
-
-}

packages/coupon/src/Contracts/CouponContracts.php

@@ -1,30 +0,0 @@
-<?php
-
-namespace XuanChen\Coupon\Contracts;
-
-interface CouponContracts
-{
-
-    //发券接口
-    function grant();
-
-    /**
-     * Notes: 查询卡券详情
-     * @Author: 玄尘
-     * @Date  : 2020/6/29 15:15
-     * @return mixed
-     */
-    function detail();
-
-    //作废接口
-    function destroy();
-
-    /**
-     * Notes: 核销执行入口
-     * @Author: 玄尘
-     * @Date  : 2020/6/29 14:49
-     * @return mixed
-     */
-    function start();
-
-}

packages/coupon/src/Coupon.php

@@ -1,144 +0,0 @@
-<?php
-
-namespace XuanChen\Coupon;
-
-use App\Models\Activity;
-use App\Models\User;
-use Illuminate\Support\Facades\DB;
-
-/**
- * 自有卡券系统
- */
-class Coupon
-{
-
-    /**
-     * 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();
-        }
-
-    }
-
-}

packages/coupon/src/CouponServiceProvider.php

@@ -1,32 +0,0 @@
-<?php
-
-namespace XuanChen\Coupon;
-
-use Illuminate\Support\ServiceProvider;
-
-class CouponServiceProvider extends ServiceProvider
-{
-
-    /**
-     * Register services.
-     * @return void
-     */
-    public function register()
-    {
-        dd(1);
-        if ($this->app->runningInConsole()) {
-            $this->publishes([__DIR__ . '/../config/xuanchen_coupon.php' => config_path('xuanchen_coupon.php')]);
-        }
-    }
-
-    /**
-     * Bootstrap services.
-     * @return void
-     */
-    public function boot()
-    {
-        $this->mergeConfigFrom(__DIR__ . '/../config/xuanchen_coupon.php', 'xuanchen_coupon');
-
-    }
-
-}

packages/coupon/src/ServiceProvider.php

@@ -1,31 +0,0 @@
-<?php
-
-namespace XuanChen\Coupon;
-
-use Illuminate\Support\ServiceProvider as LaravelServiceProvider;
-
-class ServiceProvider extends LaravelServiceProvider
-{
-
-    /**
-     * Register services.
-     * @return void
-     */
-    public function register()
-    {
-        if ($this->app->runningInConsole()) {
-            $this->publishes([__DIR__ . '/../config/xuanchen_coupon.php' => config_path('xuanchen_coupon.php')]);
-        }
-    }
-
-    /**
-     * Bootstrap services.
-     * @return void
-     */
-    public function boot()
-    {
-        $this->mergeConfigFrom(__DIR__ . '/../config/xuanchen_coupon.php', 'xuanchen_coupon');
-
-    }
-
-}

packages/coupon/src/Traits/Log.php

@@ -1,47 +0,0 @@
-<?php
-
-namespace XuanChen\Coupon\Traits;
-
-use App\Models\Log as LogModel;
-
-trait Log
-{
-
-    /**
-     * Notes: 插入日志
-     * @Author: 玄尘
-     * @Date  : 2020/6/30 10:29
-     * @param        $url
-     * @param        $method
-     * @param        $params
-     * @param string $type
-     * @return mixed
-     */
-    public function createLog($url, $method, $params, $type = 'pingan')
-    {
-        $data = [
-            'path'      => $url,
-            'method'    => $method,
-            'type'      => $type,
-            'in_source' => $params,
-        ];
-
-        $info = LogModel::create($data);
-
-        return $info;
-    }
-
-    /**
-     * Notes: 更新日志
-     * @Author: 玄尘
-     * @Date  : 2020/6/30 10:29
-     * @param $log
-     * @param $params
-     */
-    public static function updateLog($log, $params)
-    {
-        $log->out_source = $params;
-        $log->save();
-    }
-
-}

packages/coupon/src/Traits/SetParams.php

@@ -1,79 +0,0 @@
-<?php
-
-namespace XuanChen\Coupon\Traits;
-
-trait SetParams
-{
-
-    //渠道
-    public $user;
-
-    //卡券编号
-    public $redemptionCode;
-
-    //订单金额
-    public $total;
-
-    //网点编号
-    public $outletId;
-
-    //活动id
-    public $activityId;
-
-    //手机号
-    public $mobile;
-
-    //设置渠道
-    public function setUser($user)
-    {
-        $this->user = $user;
-
-        return $this;
-    }
-
-    //设置核销码
-    public function setCode($redemptionCode)
-    {
-        $this->redemptionCode = $redemptionCode;
-
-        return $this;
-
-    }
-
-    //设置订单总额
-    public function setTotal($total)
-    {
-        $this->total = $total;
-
-        return $this;
-
-    }
-
-    //设置网点id
-    public function setOutletId($outletId)
-    {
-        $this->outletId = $outletId;
-
-        return $this;
-
-    }
-
-    //设置活动id
-    public function setActivityId($activityId)
-    {
-        $this->activityId = $activityId;
-
-        return $this;
-
-    }
-
-    //设置手机号
-    public function setMobile($mobile)
-    {
-        $this->mobile = $mobile;
-
-        return $this;
-
-    }
-
-}

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

storage/framework/views/007814b8e2c600a6d375f37e88a9dc03f549bbea.php

@@ -1,83 +0,0 @@
-<div class="box grid-box">
-    <?php if(isset($title)): ?>
-    <div class="box-header with-border">
-        <h3 class="box-title"> <?php echo e($title, false); ?></h3>
-    </div>
-    <?php endif; ?>
-
-    <?php if( $grid->showTools() || $grid->showExportBtn() || $grid->showCreateBtn() ): ?>
-    <div class="box-header with-border">
-        <div class="pull-right">
-            <?php echo $grid->renderColumnSelector(); ?>
-
-            <?php echo $grid->renderExportButton(); ?>
-
-            <?php echo $grid->renderCreateButton(); ?>
-
-        </div>
-        <?php if( $grid->showTools() ): ?>
-        <div class="pull-left">
-            <?php echo $grid->renderHeaderTools(); ?>
-
-        </div>
-        <?php endif; ?>
-    </div>
-    <?php endif; ?>
-
-    <?php echo $grid->renderFilter(); ?>
-
-
-    <?php echo $grid->renderHeader(); ?>
-
-
-    <!-- /.box-header -->
-    <div class="box-body table-responsive no-padding">
-        <table class="table table-hover grid-table" id="<?php echo e($grid->tableID, false); ?>">
-            <thead>
-                <tr>
-                    <?php $__currentLoopData = $grid->visibleColumns(); $__env->addLoop($__currentLoopData); foreach($__currentLoopData as $column): $__env->incrementLoopIndices(); $loop = $__env->getLastLoop(); ?>
-                    <th <?php echo $column->formatHtmlAttributes(); ?>><?php echo $column->getLabel(); ?><?php echo $column->renderHeader(); ?></th>
-                    <?php endforeach; $__env->popLoop(); $loop = $__env->getLastLoop(); ?>
-                </tr>
-            </thead>
-
-            <?php if($grid->hasQuickCreate()): ?>
-                <?php echo $grid->renderQuickCreate(); ?>
-
-            <?php endif; ?>
-
-            <tbody>
-
-                <?php if($grid->rows()->isEmpty() && $grid->showDefineEmptyPage()): ?>
-                    <?php echo $__env->make('admin::grid.empty-grid', \Illuminate\Support\Arr::except(get_defined_vars(), ['__data', '__path']))->render(); ?>
-                <?php endif; ?>
-
-                <?php $__currentLoopData = $grid->rows(); $__env->addLoop($__currentLoopData); foreach($__currentLoopData as $row): $__env->incrementLoopIndices(); $loop = $__env->getLastLoop(); ?>
-                <tr <?php echo $row->getRowAttributes(); ?>>
-                    <?php $__currentLoopData = $grid->visibleColumnNames(); $__env->addLoop($__currentLoopData); foreach($__currentLoopData as $name): $__env->incrementLoopIndices(); $loop = $__env->getLastLoop(); ?>
-                    <td <?php echo $row->getColumnAttributes($name); ?>>
-                        <?php echo $row->column($name); ?>
-
-                    </td>
-                    <?php endforeach; $__env->popLoop(); $loop = $__env->getLastLoop(); ?>
-                </tr>
-                <?php endforeach; $__env->popLoop(); $loop = $__env->getLastLoop(); ?>
-            </tbody>
-
-            <?php echo $grid->renderTotalRow(); ?>
-
-
-        </table>
-
-    </div>
-
-    <?php echo $grid->renderFooter(); ?>
-
-
-    <div class="box-footer clearfix">
-        <?php echo $grid->paginator(); ?>
-
-    </div>
-    <!-- /.box-body -->
-</div>
-<?php /**PATH /home/wwwroot/pingan/vendor/encore/laravel-admin/src/../resources/views/grid/table.blade.php ENDPATH**/ ?>

storage/framework/views/01c056b604351e0d923fe2c65734008322071f33.php

@@ -1,36 +0,0 @@
-<form <?php echo $attributes; ?>>
-    <div class="box-body fields-group">
-
-        <?php $__currentLoopData = $fields; $__env->addLoop($__currentLoopData); foreach($__currentLoopData as $field): $__env->incrementLoopIndices(); $loop = $__env->getLastLoop(); ?>
-            <?php echo $field->render(); ?>
-
-        <?php endforeach; $__env->popLoop(); $loop = $__env->getLastLoop(); ?>
-
-    </div>
-
-    <?php if($method != 'GET'): ?>
-        <input type="hidden" name="_token" value="<?php echo e(csrf_token(), false); ?>">
-    <?php endif; ?>
-    
-    <!-- /.box-body -->
-    <?php if(count($buttons) > 0): ?>
-    <div class="box-footer">
-        <div class="col-md-<?php echo e($width['label'], false); ?>"></div>
-
-        <div class="col-md-<?php echo e($width['field'], false); ?>">
-            <?php if(in_array('reset', $buttons)): ?>
-            <div class="btn-group pull-left">
-                <button type="reset" class="btn btn-warning pull-right"><?php echo e(trans('admin.reset'), false); ?></button>
-            </div>
-            <?php endif; ?>
-
-            <?php if(in_array('submit', $buttons)): ?>
-            <div class="btn-group pull-right">
-                <button type="submit" class="btn btn-info pull-right"><?php echo e(trans('admin.submit'), false); ?></button>
-            </div>
-            <?php endif; ?>
-        </div>
-    </div>
-    <?php endif; ?>
-</form>
-<?php /**PATH /home/wwwroot/pingan/vendor/encore/laravel-admin/src/../resources/views/widgets/form.blade.php ENDPATH**/ ?>

storage/framework/views/0301773cc50146df7b50b9519152bf76f2e9be1d.php

@@ -1,29 +0,0 @@
-<div class="<?php echo e($viewClass['form-group'], false); ?> <?php echo ($errors->has($errorKey['start'].'start') || $errors->has($errorKey['end'].'end')) ? 'has-error' : ''; ?>">
-
-    <label for="<?php echo e($id['start'], false); ?>" class="<?php echo e($viewClass['label'], false); ?> control-label"><?php echo e($label, false); ?></label>
-
-    <div class="<?php echo e($viewClass['field'], false); ?>">
-
-        <?php echo $__env->make('admin::form.error', \Illuminate\Support\Arr::except(get_defined_vars(), ['__data', '__path']))->render(); ?>
-
-        <div class="row" style="width: 370px">
-            <div class="col-lg-6">
-                <div class="input-group">
-                    <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                    <input type="text" name="<?php echo e($name['start'], false); ?>" value="<?php echo e(old($column['start'], $value['start'] ?? null), false); ?>" class="form-control <?php echo e($class['start'], false); ?>" style="width: 150px" <?php echo $attributes; ?> />
-                </div>
-            </div>
-
-            <div class="col-lg-6">
-                <div class="input-group">
-                    <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                    <input type="text" name="<?php echo e($name['end'], false); ?>" value="<?php echo e(old($column['end'], $value['end'] ?? null), false); ?>" class="form-control <?php echo e($class['end'], false); ?>" style="width: 150px" <?php echo $attributes; ?> />
-                </div>
-            </div>
-        </div>
-
-        <?php echo $__env->make('admin::form.help-block', \Illuminate\Support\Arr::except(get_defined_vars(), ['__data', '__path']))->render(); ?>
-
-    </div>
-</div>
-<?php /**PATH /home/wwwroot/pingan/vendor/encore/laravel-admin/src/../resources/views/form/daterange.blade.php ENDPATH**/ ?>

storage/framework/views/041791cc8e988d93c8fe42f5501609f1bcb90ba0.php

@@ -1,67 +0,0 @@
-<!-- Main Header -->
-<header class="main-header">
-
-    <!-- Logo -->
-    <a href="<?php echo e(admin_url('/'), false); ?>" class="logo">
-        <!-- mini logo for sidebar mini 50x50 pixels -->
-        <span class="logo-mini"><?php echo config('admin.logo-mini', config('admin.name')); ?></span>
-        <!-- logo for regular state and mobile devices -->
-        <span class="logo-lg"><?php echo config('admin.logo', config('admin.name')); ?></span>
-    </a>
-
-    <!-- Header Navbar -->
-    <nav class="navbar navbar-static-top" role="navigation">
-        <!-- Sidebar toggle button-->
-        <a href="#" class="sidebar-toggle" data-toggle="offcanvas" role="button">
-            <span class="sr-only">Toggle navigation</span>
-        </a>
-        <ul class="nav navbar-nav hidden-sm visible-lg-block">
-        <?php echo Admin::getNavbar()->render('left'); ?>
-
-        </ul>
-
-        <!-- Navbar Right Menu -->
-        <div class="navbar-custom-menu">
-            <ul class="nav navbar-nav">
-
-                <?php echo Admin::getNavbar()->render(); ?>
-
-
-                <!-- User Account Menu -->
-                <li class="dropdown user user-menu">
-                    <!-- Menu Toggle Button -->
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">
-                        <!-- The user image in the navbar-->
-                        <img src="<?php echo e(Admin::user()->avatar, false); ?>" class="user-image" alt="User Image">
-                        <!-- hidden-xs hides the username on small devices so only the image appears. -->
-                        <span class="hidden-xs"><?php echo e(Admin::user()->name, false); ?></span>
-                    </a>
-                    <ul class="dropdown-menu">
-                        <!-- The user image in the menu -->
-                        <li class="user-header">
-                            <img src="<?php echo e(Admin::user()->avatar, false); ?>" class="img-circle" alt="User Image">
-
-                            <p>
-                                <?php echo e(Admin::user()->name, false); ?>
-
-                                <small>Member since admin <?php echo e(Admin::user()->created_at, false); ?></small>
-                            </p>
-                        </li>
-                        <li class="user-footer">
-                            <div class="pull-left">
-                                <a href="<?php echo e(admin_url('auth/setting'), false); ?>" class="btn btn-default btn-flat"><?php echo e(trans('admin.setting'), false); ?></a>
-                            </div>
-                            <div class="pull-right">
-                                <a href="<?php echo e(admin_url('auth/logout'), false); ?>" class="btn btn-default btn-flat"><?php echo e(trans('admin.logout'), false); ?></a>
-                            </div>
-                        </li>
-                    </ul>
-                </li>
-                <!-- Control Sidebar Toggle Button -->
-                
-                    
-                
-            </ul>
-        </div>
-    </nav>
-</header><?php /**PATH /home/wwwroot/pingan/vendor/encore/laravel-admin/src/../resources/views/partials/header.blade.php ENDPATH**/ ?>

storage/framework/views/141a9a628ef948ea2d6eb08062c5d200b36412e1.php

@@ -1,15 +0,0 @@
-<div class="<?php echo e($viewClass['form-group'], false); ?> <?php echo !$errors->has($errorKey) ? '' : 'has-error'; ?>">
-
-    <label for="<?php echo e($id, false); ?>" class="<?php echo e($viewClass['label'], false); ?> control-label"><?php echo e($label, false); ?></label>
-
-    <div class="<?php echo e($viewClass['field'], false); ?>">
-
-        <?php echo $__env->make('admin::form.error', \Illuminate\Support\Arr::except(get_defined_vars(), ['__data', '__path']))->render(); ?>
-
-        <textarea name="<?php echo e($name, false); ?>" class="form-control <?php echo e($class, false); ?>" rows="<?php echo e($rows, false); ?>" placeholder="<?php echo e($placeholder, false); ?>" <?php echo $attributes; ?> ><?php echo e(old($column, $value), false); ?></textarea>
-
-        <?php echo $__env->make('admin::form.help-block', \Illuminate\Support\Arr::except(get_defined_vars(), ['__data', '__path']))->render(); ?>
-
-    </div>
-</div>
-<?php /**PATH /home/wwwroot/pingan/vendor/encore/laravel-admin/src/../resources/views/form/textarea.blade.php ENDPATH**/ ?>

storage/framework/views/1616f3416f2d1a202acbaa0444fe12d8848515da.php

@@ -1,31 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8">
-    <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
-    <meta http-equiv="Pragma" content="no-cache" />
-    <meta http-equiv="Expires" content="0" />
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-
-    <title><?php echo $__env->yieldContent('title', $app_title??config('app.name')); ?></title>
-    <link rel="stylesheet" href="<?php echo e(asset('css/mzui.min.css'), false); ?>">
-    <link rel="stylesheet" href="<?php echo e(asset('css/swiper.min.css'), false); ?>">
-    <link rel="stylesheet" href="<?php echo e(asset('css/style.css'), false); ?>?_<?php echo e(time(), false); ?>">
-    <?php echo $__env->yieldContent('css'); ?>
-    <?php echo $__env->yieldContent('js'); ?>
-
-</head>
-<body>
-    <?php echo $__env->yieldContent('footer'); ?>
-    <?php echo $__env->yieldContent('pop'); ?>
-    <?php echo $__env->yieldContent('content'); ?>
-</body>
-
-<script type="text/javascript" src="/js/jquery-3.2.1.min.js"></script>
-<script type="text/javascript" src="/js/mzui.min.js" ></script>
-<script type="text/javascript" src="/js/layer/layer.min.js" ></script>
-<script type="text/javascript" src="/js/cjango.js?v=<?php echo e(uniqid(), false); ?>"></script>
-
-<?php echo $__env->yieldContent('script'); ?>
-</html>
-<?php /**PATH /home/wwwroot/pingan/resources/views/layouts/app.blade.php ENDPATH**/ ?>

storage/framework/views/21bd2a8a9168e8e602ed60969606e01873ff7dc0.php

@@ -1,32 +0,0 @@
-<div class="<?php echo e($viewClass['form-group'], false); ?> <?php echo !$errors->has($errorKey) ? '' : 'has-error'; ?>">
-
-<label for="<?php echo e($id, false); ?>" class="<?php echo e($viewClass['label'], false); ?> control-label"><?php echo e($label, false); ?></label>
-
-    <div class="<?php echo e($viewClass['field'], false); ?>">
-
-        <?php echo $__env->make('admin::form.error', \Illuminate\Support\Arr::except(get_defined_vars(), ['__data', '__path']))->render(); ?>
-
-        <input type="hidden" name="<?php echo e($name, false); ?>"/>
-
-        <select class="form-control <?php echo e($class, false); ?>" style="width: 100%;" name="<?php echo e($name, false); ?>" <?php echo $attributes; ?> >
-            <?php if($groups): ?>
-                <?php $__currentLoopData = $groups; $__env->addLoop($__currentLoopData); foreach($__currentLoopData as $group): $__env->incrementLoopIndices(); $loop = $__env->getLastLoop(); ?>
-                    <optgroup label="<?php echo e($group['label'], false); ?>">
-                        <?php $__currentLoopData = $group['options']; $__env->addLoop($__currentLoopData); foreach($__currentLoopData as $select => $option): $__env->incrementLoopIndices(); $loop = $__env->getLastLoop(); ?>
-                            <option value="<?php echo e($select, false); ?>" <?php echo e($select == old($column, $value) ?'selected':'', false); ?>><?php echo e($option, false); ?></option>
-                        <?php endforeach; $__env->popLoop(); $loop = $__env->getLastLoop(); ?>
-                    </optgroup>
-                <?php endforeach; $__env->popLoop(); $loop = $__env->getLastLoop(); ?>
-             <?php else: ?>
-                <option value=""></option>
-                <?php $__currentLoopData = $options; $__env->addLoop($__currentLoopData); foreach($__currentLoopData as $select => $option): $__env->incrementLoopIndices(); $loop = $__env->getLastLoop(); ?>
-                    <option value="<?php echo e($select, false); ?>" <?php echo e($select == old($column, $value) ?'selected':'', false); ?>><?php echo e($option, false); ?></option>
-                <?php endforeach; $__env->popLoop(); $loop = $__env->getLastLoop(); ?>
-            <?php endif; ?>
-        </select>
-
-        <?php echo $__env->make('admin::form.help-block', \Illuminate\Support\Arr::except(get_defined_vars(), ['__data', '__path']))->render(); ?>
-
-    </div>
-</div>
-<?php /**PATH /home/wwwroot/pingan/vendor/encore/laravel-admin/src/../resources/views/form/select.blade.php ENDPATH**/ ?>

storage/framework/views/242619e39fa47c5651c51c607d946c9526d20255.php

@@ -1,5 +0,0 @@
-<?php $__currentLoopData = $html; $__env->addLoop($__currentLoopData); foreach($__currentLoopData as $item): $__env->incrementLoopIndices(); $loop = $__env->getLastLoop(); ?>
-    <?php echo $item; ?>
-
-<?php endforeach; $__env->popLoop(); $loop = $__env->getLastLoop(); ?>
-<?php /**PATH /home/wwwroot/pingan/vendor/encore/laravel-admin/src/../resources/views/partials/html.blade.php ENDPATH**/ ?>

storage/framework/views/242ab2234f1564c81dced8326152a186de8c3a51.php

@@ -1,5 +0,0 @@
-<div class="form-group">
-    <label><?php echo e($label, false); ?></label>
-    <input style="width: 100%" <?php echo $attributes; ?> />
-    <?php echo $__env->make('admin::actions.form.help-block', \Illuminate\Support\Arr::except(get_defined_vars(), ['__data', '__path']))->render(); ?>
-</div><?php /**PATH /home/wwwroot/pingan/vendor/encore/laravel-admin/src/../resources/views/actions/form/date.blade.php ENDPATH**/ ?>

storage/framework/views/2545955a84e6a03891c007da99793c14c2d7579b.php

@@ -1,56 +0,0 @@
-<div class="box box-info">
-    <div class="box-header with-border">
-        <h3 class="box-title"><?php echo e($form->title(), false); ?></h3>
-
-        <div class="box-tools">
-            <?php echo $form->renderTools(); ?>
-
-        </div>
-    </div>
-    <!-- /.box-header -->
-    <!-- form start -->
-    <?php echo $form->open(); ?>
-
-
-    <div class="box-body">
-
-        <?php if(!$tabObj->isEmpty()): ?>
-            <?php echo $__env->make('admin::form.tab', compact('tabObj'), \Illuminate\Support\Arr::except(get_defined_vars(), ['__data', '__path']))->render(); ?>
-        <?php else: ?>
-            <div class="fields-group">
-
-                <?php if($form->hasRows()): ?>
-                    <?php $__currentLoopData = $form->getRows(); $__env->addLoop($__currentLoopData); foreach($__currentLoopData as $row): $__env->incrementLoopIndices(); $loop = $__env->getLastLoop(); ?>
-                        <?php echo $row->render(); ?>
-
-                    <?php endforeach; $__env->popLoop(); $loop = $__env->getLastLoop(); ?>
-                <?php else: ?>
-                    <?php $__currentLoopData = $layout->columns(); $__env->addLoop($__currentLoopData); foreach($__currentLoopData as $column): $__env->incrementLoopIndices(); $loop = $__env->getLastLoop(); ?>
-                        <div class="col-md-<?php echo e($column->width(), false); ?>">
-                            <?php $__currentLoopData = $column->fields(); $__env->addLoop($__currentLoopData); foreach($__currentLoopData as $field): $__env->incrementLoopIndices(); $loop = $__env->getLastLoop(); ?>
-                                <?php echo $field->render(); ?>
-
-                            <?php endforeach; $__env->popLoop(); $loop = $__env->getLastLoop(); ?>
-                        </div>
-                    <?php endforeach; $__env->popLoop(); $loop = $__env->getLastLoop(); ?>
-                <?php endif; ?>
-            </div>
-        <?php endif; ?>
-
-    </div>
-    <!-- /.box-body -->
-
-    <?php echo $form->renderFooter(); ?>
-
-
-    <?php $__currentLoopData = $form->getHiddenFields(); $__env->addLoop($__currentLoopData); foreach($__currentLoopData as $field): $__env->incrementLoopIndices(); $loop = $__env->getLastLoop(); ?>
-        <?php echo $field->render(); ?>
-
-    <?php endforeach; $__env->popLoop(); $loop = $__env->getLastLoop(); ?>
-
-<!-- /.box-footer -->
-    <?php echo $form->close(); ?>
-
-</div>
-
-<?php /**PATH /home/wwwroot/pingan/vendor/encore/laravel-admin/src/../resources/views/form.blade.php ENDPATH**/ ?>

storage/framework/views/27ea16797fa7064bbd64adeba88a07880d59dfac.php

@@ -1,14 +0,0 @@
-<div <?php echo $attributes; ?>>
-    <div class="inner">
-        <h3><?php echo e($info, false); ?></h3>
-
-        <p><?php echo e($name, false); ?></p>
-    </div>
-    <div class="icon">
-        <i class="fa fa-<?php echo e($icon, false); ?>"></i>
-    </div>
-    <a href="<?php echo e($link, false); ?>" class="small-box-footer">
-        <?php echo e(trans('admin.more'), false); ?>&nbsp;
-        <i class="fa fa-arrow-circle-right"></i>
-    </a>
-</div><?php /**PATH /home/wwwroot/pingan/vendor/encore/laravel-admin/src/../resources/views/widgets/info-box.blade.php ENDPATH**/ ?>

storage/framework/views/2e337bf186f54edadbbb71f831ed6469155951c5.php

@@ -1,6 +0,0 @@
-<style type="text/css">
-    <?php $__currentLoopData = $style; $__env->addLoop($__currentLoopData); foreach($__currentLoopData as $s): $__env->incrementLoopIndices(); $loop = $__env->getLastLoop(); ?>
-        <?php echo $s; ?>
-
-    <?php endforeach; $__env->popLoop(); $loop = $__env->getLastLoop(); ?>
-</style><?php /**PATH /home/wwwroot/pingan/vendor/encore/laravel-admin/src/../resources/views/partials/style.blade.php ENDPATH**/ ?>

storage/framework/views/33de8610abd9767ef7aa4f231b5843c10de5406f.php

@@ -1,62 +0,0 @@
-
-<div class="row">
-    <div class="<?php echo e($viewClass['label'], false); ?>"><h4 class="pull-right"><?php echo e($label, false); ?></h4></div>
-    <div class="<?php echo e($viewClass['field'], false); ?>"></div>
-</div>
-
-<hr style="margin-top: 0px;">
-
-<div id="has-many-<?php echo e($column, false); ?>" class="has-many-<?php echo e($column, false); ?>">
-
-    <div class="has-many-<?php echo e($column, false); ?>-forms">
-
-        <?php $__currentLoopData = $forms; $__env->addLoop($__currentLoopData); foreach($__currentLoopData as $pk => $form): $__env->incrementLoopIndices(); $loop = $__env->getLastLoop(); ?>
-
-            <div class="has-many-<?php echo e($column, false); ?>-form fields-group">
-
-                <?php $__currentLoopData = $form->fields(); $__env->addLoop($__currentLoopData); foreach($__currentLoopData as $field): $__env->incrementLoopIndices(); $loop = $__env->getLastLoop(); ?>
-                    <?php echo $field->render(); ?>
-
-                <?php endforeach; $__env->popLoop(); $loop = $__env->getLastLoop(); ?>
-
-                <?php if($options['allowDelete']): ?>
-                <div class="form-group">
-                    <label class="<?php echo e($viewClass['label'], false); ?> control-label"></label>
-                    <div class="<?php echo e($viewClass['field'], false); ?>">
-                        <div class="remove btn btn-warning btn-sm pull-right"><i class="fa fa-trash">&nbsp;</i><?php echo e(trans('admin.remove'), false); ?></div>
-                    </div>
-                </div>
-                <?php endif; ?>
-                <hr>
-            </div>
-
-        <?php endforeach; $__env->popLoop(); $loop = $__env->getLastLoop(); ?>
-    </div>
-    
-
-    <template class="<?php echo e($column, false); ?>-tpl">
-        <div class="has-many-<?php echo e($column, false); ?>-form fields-group">
-
-            <?php echo $template; ?>
-
-
-            <div class="form-group">
-                <label class="<?php echo e($viewClass['label'], false); ?> control-label"></label>
-                <div class="<?php echo e($viewClass['field'], false); ?>">
-                    <div class="remove btn btn-warning btn-sm pull-right"><i class="fa fa-trash"></i>&nbsp;<?php echo e(trans('admin.remove'), false); ?></div>
-                </div>
-            </div>
-            <hr>
-        </div>
-    </template>
-
-    <?php if($options['allowCreate']): ?>
-    <div class="form-group">
-        <label class="<?php echo e($viewClass['label'], false); ?> control-label"></label>
-        <div class="<?php echo e($viewClass['field'], false); ?>">
-            <div class="add btn btn-success btn-sm"><i class="fa fa-save"></i>&nbsp;<?php echo e(trans('admin.new'), false); ?></div>
-        </div>
-    </div>
-    <?php endif; ?>
-
-</div><?php /**PATH /home/wwwroot/pingan/vendor/encore/laravel-admin/src/../resources/views/form/hasmany.blade.php ENDPATH**/ ?>

storage/framework/views/3459b6eeb71ef78df861dbfb49cf0ce1d19c3ead.php

@@ -1,20 +0,0 @@
-<div class="<?php echo e($viewClass['form-group'], false); ?> <?php echo !$errors->has($errorKey) ? '' : 'has-error'; ?>">
-
-    <label for="<?php echo e($id, false); ?>" class="<?php echo e($viewClass['label'], false); ?> control-label"><?php echo e($label, false); ?></label>
-
-    <div class="<?php echo e($viewClass['field'], false); ?>">
-
-        <?php echo $__env->make('admin::form.error', \Illuminate\Support\Arr::except(get_defined_vars(), ['__data', '__path']))->render(); ?>
-
-        <select class="form-control <?php echo e($class, false); ?>" style="width: 100%;" name="<?php echo e($name, false); ?>[]" multiple="multiple" data-placeholder="<?php echo e($placeholder, false); ?>" <?php echo $attributes; ?> >
-            <?php $__currentLoopData = $options; $__env->addLoop($__currentLoopData); foreach($__currentLoopData as $select => $option): $__env->incrementLoopIndices(); $loop = $__env->getLastLoop(); ?>
-                <option value="<?php echo e($select, false); ?>" <?php echo e(in_array($select, (array)old($column, $value)) ?'selected':'', false); ?>><?php echo e($option, false); ?></option>
-            <?php endforeach; $__env->popLoop(); $loop = $__env->getLastLoop(); ?>
-        </select>
-        <input type="hidden" name="<?php echo e($name, false); ?>[]" />
-
-        <?php echo $__env->make('admin::form.help-block', \Illuminate\Support\Arr::except(get_defined_vars(), ['__data', '__path']))->render(); ?>
-
-    </div>
-</div>
-<?php /**PATH /home/wwwroot/pingan/vendor/encore/laravel-admin/src/../resources/views/form/listbox.blade.php ENDPATH**/ ?>

storage/framework/views/38bd34660972d8680ceaf8434cf399e64a20f19e.php

@@ -1,35 +0,0 @@
-<?php if(Admin::user()->visible(\Illuminate\Support\Arr::get($item, 'roles', [])) && Admin::user()->can(\Illuminate\Support\Arr::get($item, 'permission'))): ?>
-    <?php if(!isset($item['children'])): ?>
-        <li>
-            <?php if(url()->isValidUrl($item['uri'])): ?>
-                <a href="<?php echo e($item['uri'], false); ?>" target="_blank">
-            <?php else: ?>
-                 <a href="<?php echo e(admin_url($item['uri']), false); ?>">
-            <?php endif; ?>
-                <i class="fa <?php echo e($item['icon'], false); ?>"></i>
-                <?php if(Lang::has($titleTranslation = 'admin.menu_titles.' . trim(str_replace(' ', '_', strtolower($item['title']))))): ?>
-                    <span><?php echo e(__($titleTranslation), false); ?></span>
-                <?php else: ?>
-                    <span><?php echo e(admin_trans($item['title']), false); ?></span>
-                <?php endif; ?>
-            </a>
-        </li>
-    <?php else: ?>
-        <li class="treeview">
-            <a href="#">
-                <i class="fa <?php echo e($item['icon'], false); ?>"></i>
-                <?php if(Lang::has($titleTranslation = 'admin.menu_titles.' . trim(str_replace(' ', '_', strtolower($item['title']))))): ?>
-                    <span><?php echo e(__($titleTranslation), false); ?></span>
-                <?php else: ?>
-                    <span><?php echo e(admin_trans($item['title']), false); ?></span>
-                <?php endif; ?>
-                <i class="fa fa-angle-left pull-right"></i>
-            </a>
-            <ul class="treeview-menu">
-                <?php $__currentLoopData = $item['children']; $__env->addLoop($__currentLoopData); foreach($__currentLoopData as $item): $__env->incrementLoopIndices(); $loop = $__env->getLastLoop(); ?>
-                    <?php echo $__env->make('admin::partials.menu', $item, \Illuminate\Support\Arr::except(get_defined_vars(), ['__data', '__path']))->render(); ?>
-                <?php endforeach; $__env->popLoop(); $loop = $__env->getLastLoop(); ?>
-            </ul>
-        </li>
-    <?php endif; ?>
-<?php endif; ?><?php /**PATH /home/wwwroot/pingan/vendor/encore/laravel-admin/src/../resources/views/partials/menu.blade.php ENDPATH**/ ?>

storage/framework/views/399ddfcf6ac5c6324f9a61abd696dadfa941fa87.php

@@ -1,14 +0,0 @@
-<div class="form-group">
-    <label><?php echo e($label, false); ?></label>
-
-    <select class="form-control <?php echo e($class, false); ?>" style="width: 100%;" name="<?php echo e($name, false); ?>" <?php echo $attributes; ?> >
-
-        <option value=""></option>
-        <?php $__currentLoopData = $options; $__env->addLoop($__currentLoopData); foreach($__currentLoopData as $select => $option): $__env->incrementLoopIndices(); $loop = $__env->getLastLoop(); ?>
-            <option value="<?php echo e($select, false); ?>" <?php echo e($select == old($column, $value) ?'selected':'', false); ?>><?php echo e($option, false); ?></option>
-        <?php endforeach; $__env->popLoop(); $loop = $__env->getLastLoop(); ?>
-    </select>
-    <?php echo $__env->make('admin::actions.form.help-block', \Illuminate\Support\Arr::except(get_defined_vars(), ['__data', '__path']))->render(); ?>
-</div>
-
-<?php /**PATH /home/wwwroot/pingan/vendor/encore/laravel-admin/src/../resources/views/actions/form/select.blade.php ENDPATH**/ ?>

storage/framework/views/3c3520a825114c02248a43124c589797daebc0ba.php

@@ -1,15 +0,0 @@
-<?php if(is_array($errorKey)): ?>
-    <?php $__currentLoopData = $errorKey; $__env->addLoop($__currentLoopData); foreach($__currentLoopData as $key => $col): $__env->incrementLoopIndices(); $loop = $__env->getLastLoop(); ?>
-        <?php if($errors->has($col.$key)): ?>
-            <?php $__currentLoopData = $errors->get($col.$key); $__env->addLoop($__currentLoopData); foreach($__currentLoopData as $message): $__env->incrementLoopIndices(); $loop = $__env->getLastLoop(); ?>
-                <label class="control-label" for="inputError"><i class="fa fa-times-circle-o"></i> <?php echo e($message, false); ?></label><br/>
-            <?php endforeach; $__env->popLoop(); $loop = $__env->getLastLoop(); ?>
-        <?php endif; ?>
-    <?php endforeach; $__env->popLoop(); $loop = $__env->getLastLoop(); ?>
-<?php else: ?>
-    <?php if($errors->has($errorKey)): ?>
-        <?php $__currentLoopData = $errors->get($errorKey); $__env->addLoop($__currentLoopData); foreach($__currentLoopData as $message): $__env->incrementLoopIndices(); $loop = $__env->getLastLoop(); ?>
-            <label class="control-label" for="inputError"><i class="fa fa-times-circle-o"></i> <?php echo e($message, false); ?></label><br/>
-        <?php endforeach; $__env->popLoop(); $loop = $__env->getLastLoop(); ?>
-    <?php endif; ?>
-<?php endif; ?><?php /**PATH /home/wwwroot/pingan/vendor/encore/laravel-admin/src/../resources/views/form/error.blade.php ENDPATH**/ ?>

storage/framework/views/3dffc9b53ba80eababa2ec2f0ac9633a5ca1ebb5.php

@@ -1,21 +0,0 @@
-<div class="<?php echo e($viewClass['form-group'], false); ?> <?php echo !$errors->has($errorKey) ? '' : 'has-error'; ?>">
-
-    <label for="<?php echo e($id, false); ?>" class="<?php echo e($viewClass['label'], false); ?> control-label"><?php echo e($label, false); ?></label>
-
-    <div class="<?php echo e($viewClass['field'], false); ?>">
-
-        <?php echo $__env->make('admin::form.error', \Illuminate\Support\Arr::except(get_defined_vars(), ['__data', '__path']))->render(); ?>
-
-        <div class="btn-group radio-group-toggle">
-            <?php $__currentLoopData = $options; $__env->addLoop($__currentLoopData); foreach($__currentLoopData as $option => $label): $__env->incrementLoopIndices(); $loop = $__env->getLastLoop(); ?>
-                <label class="btn btn-default <?php echo e(($option == old($column, $value)) || ($value === null && in_array($label, $checked)) ?'active':'', false); ?>">
-                    <input type="radio" name="<?php echo e($name, false); ?>" value="<?php echo e($option, false); ?>" class="hide minimal <?php echo e($class, false); ?>" <?php echo e(($option == old($column, $value)) || ($value === null && in_array($label, $checked)) ?'checked':'', false); ?> <?php echo $attributes; ?> />&nbsp;<?php echo e($label, false); ?>&nbsp;&nbsp;
-                </label>
-            <?php endforeach; $__env->popLoop(); $loop = $__env->getLastLoop(); ?>
-        </div>
-
-        <?php echo $__env->make('admin::form.help-block', \Illuminate\Support\Arr::except(get_defined_vars(), ['__data', '__path']))->render(); ?>
-
-    </div>
-</div>
-<?php /**PATH /home/wwwroot/pingan/vendor/encore/laravel-admin/src/../resources/views/form/radiobutton.blade.php ENDPATH**/ ?>

storage/framework/views/4101dcce4f4dd10c1957c2bf09ffbf63af3bd40e.php

@@ -1,75 +0,0 @@
-<?php $__env->startSection('content'); ?>
-    <section class="content-header">
-        <h1>
-            <?php echo $header ?: trans('admin.title'); ?>
-
-            <small><?php echo $description ?: trans('admin.description'); ?></small>
-        </h1>
-
-        <!-- breadcrumb start -->
-        <?php if($breadcrumb): ?>
-        <ol class="breadcrumb" style="margin-right: 30px;">
-            <li><a href="<?php echo e(admin_url('/'), false); ?>"><i class="fa fa-dashboard"></i> <?php echo e(__('Home'), false); ?></a></li>
-            <?php $__currentLoopData = $breadcrumb; $__env->addLoop($__currentLoopData); foreach($__currentLoopData as $item): $__env->incrementLoopIndices(); $loop = $__env->getLastLoop(); ?>
-                <?php if($loop->last): ?>
-                    <li class="active">
-                        <?php if(\Illuminate\Support\Arr::has($item, 'icon')): ?>
-                            <i class="fa fa-<?php echo e($item['icon'], false); ?>"></i>
-                        <?php endif; ?>
-                        <?php echo e($item['text'], false); ?>
-
-                    </li>
-                <?php else: ?>
-                <li>
-                    <?php if(\Illuminate\Support\Arr::has($item, 'url')): ?>
-                        <a href="<?php echo e(admin_url(\Illuminate\Support\Arr::get($item, 'url')), false); ?>">
-                            <?php if(\Illuminate\Support\Arr::has($item, 'icon')): ?>
-                                <i class="fa fa-<?php echo e($item['icon'], false); ?>"></i>
-                            <?php endif; ?>
-                            <?php echo e($item['text'], false); ?>
-
-                        </a>
-                    <?php else: ?>
-                        <?php if(\Illuminate\Support\Arr::has($item, 'icon')): ?>
-                            <i class="fa fa-<?php echo e($item['icon'], false); ?>"></i>
-                        <?php endif; ?>
-                        <?php echo e($item['text'], false); ?>
-
-                    <?php endif; ?>
-                </li>
-                <?php endif; ?>
-            <?php endforeach; $__env->popLoop(); $loop = $__env->getLastLoop(); ?>
-        </ol>
-        <?php elseif(config('admin.enable_default_breadcrumb')): ?>
-        <ol class="breadcrumb" style="margin-right: 30px;">
-            <li><a href="<?php echo e(admin_url('/'), false); ?>"><i class="fa fa-dashboard"></i> <?php echo e(__('Home'), false); ?></a></li>
-            <?php for($i = 2; $i <= count(Request::segments()); $i++): ?>
-                <li>
-                <?php echo e(ucfirst(Request::segment($i)), false); ?>
-
-                </li>
-            <?php endfor; ?>
-        </ol>
-        <?php endif; ?>
-
-        <!-- breadcrumb end -->
-
-    </section>
-
-    <section class="content">
-
-        <?php echo $__env->make('admin::partials.alerts', \Illuminate\Support\Arr::except(get_defined_vars(), ['__data', '__path']))->render(); ?>
-        <?php echo $__env->make('admin::partials.exception', \Illuminate\Support\Arr::except(get_defined_vars(), ['__data', '__path']))->render(); ?>
-        <?php echo $__env->make('admin::partials.toastr', \Illuminate\Support\Arr::except(get_defined_vars(), ['__data', '__path']))->render(); ?>
-
-        <?php if($_view_): ?>
-            <?php echo $__env->make($_view_['view'], $_view_['data'], \Illuminate\Support\Arr::except(get_defined_vars(), ['__data', '__path']))->render(); ?>
-        <?php else: ?>
-            <?php echo $_content_; ?>
-
-        <?php endif; ?>
-
-    </section>
-<?php $__env->stopSection(); ?>
-
-<?php echo $__env->make('admin::index', ['header' => strip_tags($header)], \Illuminate\Support\Arr::except(get_defined_vars(), ['__data', '__path']))->render(); ?><?php /**PATH /home/wwwroot/pingan/vendor/encore/laravel-admin/src/../resources/views/content.blade.php ENDPATH**/ ?>

storage/framework/views/432a74c554976a198bfb25103d830411cb55be60.php

@@ -1,5 +0,0 @@
-<div class="form-group">
-    <label><?php echo e($label, false); ?></label>
-    <input <?php echo $attributes; ?>>
-    <?php echo $__env->make('admin::actions.form.help-block', \Illuminate\Support\Arr::except(get_defined_vars(), ['__data', '__path']))->render(); ?>
-</div><?php /**PATH /home/wwwroot/pingan/vendor/encore/laravel-admin/src/../resources/views/actions/form/text.blade.php ENDPATH**/ ?>

storage/framework/views/4423b7a0f1450075c7dc369f8fe0fedeb0a17711.php

@@ -1,139 +0,0 @@
-<?php $__env->startSection('title', '核销列表'); ?>
-
-<?php $__env->startSection('css'); ?>
-<link rel="stylesheet" href="<?php echo e(asset('assets/merchant/css/plugins/datapicker/datepicker3.css'), false); ?>" />
-<?php $__env->stopSection(); ?>
-
-<?php $__env->startPush('script'); ?>
-<script type="text/javascript" src="<?php echo e(asset('assets/merchant/js/plugins/datapicker/bootstrap-datepicker.js'), false); ?>"></script>
-<script type="text/javascript">
-    $("#time-interval .input-daterange").datepicker({
-        keyboardNavigation: !1,
-        forceParse: !1,
-        autoclose: !0,
-        clearBtn: true,
-    });
-
-    $("button").click(function(){
-        var $this = $(this);
-        var $form   = $this.parents('form');
-        $("input[name='action']").val($this.data('action'));
-        $form.submit();
-    });
-
-</script>
-<?php $__env->stopPush(); ?>
-
-<?php $__env->startSection('content'); ?>
-<div class="ibox">
-    <div class="ibox-content">
-        <div class="row">
-            <div class="col-sm-12 m-b">
-                <form action="<?php echo e(route('merchant.coupons'), false); ?>" class="form-inline pull-right" method="get" accept-charset="utf-8">
-                    <div class="input-group">
-                        <div class="form-group">
-                            <input type="text" placeholder="网点名称" name="outlet" class="input-sm form-control" value="<?php echo e(Request::input('outlet'), false); ?>">
-                        </div>
-
-                        <div class="form-group">
-                            <input type="text" placeholder="平安券编号" name="redemptionCode" class="input-sm form-control" value="<?php echo e(Request::input('redemptionCode'), false); ?>">
-                        </div>
-
-                        <div class="form-group">
-                            <select class="form-control m-b" name="status">
-                                <option value="">状态</option>
-                                <option value="2" <?php if(request()->status==2): ?> selected="" <?php endif; ?> >核销成功</option>
-                                <option value="3" <?php if(request()->status==3): ?> selected="" <?php endif; ?> >核销失败</option>
-                                
-                            </select>
-                        </div>
-                        <div class="form-group">
-                            <select class="form-control m-b" name="thirdPartyGoodsId">
-                                <option value="">政策</option>
-                                <option value="YSD-full100-10" <?php if(request()->thirdPartyGoodsId=='YSD-full100-10'): ?> selected="" <?php endif; ?> >100减10元</option>
-                                <option value="YSD-full100-25" <?php if(request()->thirdPartyGoodsId=='YSD-full100-25'): ?> selected="" <?php endif; ?> >100减25元</option>
-                                <option value="YSD-full100-50" <?php if(request()->thirdPartyGoodsId=='YSD-full100-50'): ?> selected="" <?php endif; ?> >100减50元</option>
-                                <option value="YSD-full200-100" <?php if(request()->thirdPartyGoodsId=='YSD-full200-100'): ?> selected="" <?php endif; ?> >200减100元</option>
-                            </select>
-                        </div>
-
-                        <div class="form-group" id="time-interval">
-                            <div class="input-daterange input-group">
-                                <input type="text" class="input-sm form-control" placeholder="核销时间" readonly name="start" value="<?php echo e(Request::input('start'), false); ?>" />
-                                <span class="input-group-addon">~</span>
-                                <input type="text" class="input-sm form-control" placeholder="核销时间" readonly name="end" value="<?php echo e(Request::input('end'), false); ?>" />
-                            </div>
-                        </div>
-
-                        <span class="input-group-btn">
-                            <input type="hidden" name="action" value="search">
-                            <button type="button" class="btn btn-sm btn-primary" data-action="search" ><i class="fa fa-check"></i>&nbsp;搜索</button>
-                            <button type="button" class="btn btn-sm btn-warning confirm" tip='确认要导出当前条件内容？' data-action="excel"><i class="fa fa-paste"></i>&nbsp;导出</button>
-                        </span>
-
-                        <span class="input-group-btn">
-
-
-                           
-                        </span>
-                    </div>
-                </form>
-            </div>
-        </div>
-        <div class="table-responsive">
-            <table class="table table-hover">
-                <thead>
-                    <tr>
-                        <th width="100">ID</th>
-                        <th>网点名称</th>
-                        
-                        <th>平安券编号</th>
-                        <th>优惠政策</th>
-                        <th>核销金额</th>
-                        <th>状态</th>
-                        <th>处理结果</th>
-                        <th>核销时间</th>
-                        
-                    </tr>
-                </thead>
-                <tbody>
-                    <?php $__currentLoopData = $coupons; $__env->addLoop($__currentLoopData); foreach($__currentLoopData as $coupon): $__env->incrementLoopIndices(); $loop = $__env->getLastLoop(); ?>
-                    <tr>
-                        <td> <?php echo e($coupon->id, false); ?> </td>
-                        <td><?php echo e($coupon->outlet ? $coupon->outlet->nickname : 'Id:' . $coupon->outletId, false); ?></td>
-                        
-                        <td><?php echo e($coupon->redemptionCode, false); ?></td>
-                        <td><?php echo e($coupon->couponName, false); ?></td>
-                        <td><?php echo e($coupon->price, false); ?></td>
-                        <td><?php echo e($coupon->status_text, false); ?></td>
-                        <td><?php echo e($coupon->remark, false); ?></td>
-                        <td><?php echo e($coupon->created_at, false); ?></td>
-                       
-                    </tr>
-                    <?php endforeach; $__env->popLoop(); $loop = $__env->getLastLoop(); ?>
-                </tbody>
-            </table>
-        </div>
-        <div>
-            <span class="badge badge-primary">全部:<?php echo e($data['all'], false); ?>张 </span>
-            <span class="badge badge-success">成功:<?php echo e($data['pass'], false); ?>张 </span>
-            <span class="badge badge-error">失败:<?php echo e($data['reject'], false); ?>张 </span>
-            
-            
-            
-        </div>
-        <div class="text-right">
-            <?php echo e($coupons->appends([
-                'outlet'=>Request::input('outlet'),
-                'status'=>Request::input('status'),
-                'redemptionCode'=>Request::input('redemptionCode'),
-                'start'=>Request::input('start'),
-                'end'=>Request::input('end'),
-                ])->links('Merchant::common.pagination'), false); ?>
-
-        </div>
-    </div>
-</div>
-<?php $__env->stopSection(); ?>
-
-<?php echo $__env->make('Merchant::layouts.app', \Illuminate\Support\Arr::except(get_defined_vars(), ['__data', '__path']))->render(); ?><?php /**PATH /home/wwwroot/pingan/app/Merchant/Resources/views/coupon/index.blade.php ENDPATH**/ ?>

storage/framework/views/44a17271d0aee880c9f5d95c83bfea3deb282efb.php

@@ -1,6 +0,0 @@
-<div class="form-group">
-    <label><?php echo e($label, false); ?></label>
-    <input type="file" class="<?php echo e($class, false); ?>" name="<?php echo e($name, false); ?>" <?php echo $attributes; ?> />
-    <?php echo $__env->make('admin::actions.form.help-block', \Illuminate\Support\Arr::except(get_defined_vars(), ['__data', '__path']))->render(); ?>
-</div>
-<?php /**PATH /home/wwwroot/pingan/vendor/encore/laravel-admin/src/../resources/views/actions/form/file.blade.php ENDPATH**/ ?>

storage/framework/views/45770dac8434c40b1d64577647259648e0ab64d7.php

@@ -1,17 +0,0 @@
-<li class="dd-item" data-id="<?php echo e($branch[$keyName], false); ?>">
-    <div class="dd-handle">
-        <?php echo $branchCallback($branch); ?>
-
-        <span class="pull-right dd-nodrag">
-            <a href="<?php echo e(url("$path/$branch[$keyName]/edit"), false); ?>"><i class="fa fa-edit"></i></a>
-            <a href="javascript:void(0);" data-id="<?php echo e($branch[$keyName], false); ?>" class="tree_branch_delete"><i class="fa fa-trash"></i></a>
-        </span>
-    </div>
-    <?php if(isset($branch['children'])): ?>
-    <ol class="dd-list">
-        <?php $__currentLoopData = $branch['children']; $__env->addLoop($__currentLoopData); foreach($__currentLoopData as $branch): $__env->incrementLoopIndices(); $loop = $__env->getLastLoop(); ?>
-            <?php echo $__env->make($branchView, $branch, \Illuminate\Support\Arr::except(get_defined_vars(), ['__data', '__path']))->render(); ?>
-        <?php endforeach; $__env->popLoop(); $loop = $__env->getLastLoop(); ?>
-    </ol>
-    <?php endif; ?>
-</li><?php /**PATH /home/wwwroot/pingan/vendor/encore/laravel-admin/src/../resources/views/tree/branch.blade.php ENDPATH**/ ?>

storage/framework/views/45f9bcd0d36b367e1324cfee4e5690cd31f9e806.php

@@ -1,21 +0,0 @@
-<?php $__env->startSection('title', 'dashboard - index'); ?>
-
-<?php $__env->startSection('content'); ?>
-<div class="row">
-    <div class="col-sm-4">
-        <div class="ibox float-e-margins">
-            <div class="ibox-title">
-                <h5>商户信息</h5>
-
-            </div>
-            <div class="ibox-content">
-                <p><i class="fa "></i> 登录账户：<?php echo e($user->username, false); ?></p>
-                <p><i class="fa "></i> 用户昵称：<?php echo e($user->nickname, false); ?></p>
-                <p><i class="fa "></i> 用户身份：<?php echo e($user->identity_text, false); ?></p>
-            </div>
-        </div>
-    </div>
-</div>
-<?php $__env->stopSection(); ?>
-
-<?php echo $__env->make('Merchant::layouts.app', \Illuminate\Support\Arr::except(get_defined_vars(), ['__data', '__path']))->render(); ?><?php /**PATH /home/wwwroot/pingan/app/Merchant/Resources/views/index/dashboard.blade.php ENDPATH**/ ?>

storage/framework/views/4823120a2c883f51b58b9269c60e78b4ed87363a.php

@@ -1,40 +0,0 @@
-<div class="box-header with-border <?php echo e($expand?'':'hide', false); ?> filter-box" id="<?php echo e($filterID, false); ?>">
-    <form action="<?php echo $action; ?>" class="form-horizontal" pjax-container method="get">
-
-        <div class="row">
-            <?php $__currentLoopData = $layout->columns(); $__env->addLoop($__currentLoopData); foreach($__currentLoopData as $column): $__env->incrementLoopIndices(); $loop = $__env->getLastLoop(); ?>
-            <div class="col-md-<?php echo e($column->width(), false); ?>">
-                <div class="box-body">
-                    <div class="fields-group">
-                        <?php $__currentLoopData = $column->filters(); $__env->addLoop($__currentLoopData); foreach($__currentLoopData as $filter): $__env->incrementLoopIndices(); $loop = $__env->getLastLoop(); ?>
-                            <?php echo $filter->render(); ?>
-
-                        <?php endforeach; $__env->popLoop(); $loop = $__env->getLastLoop(); ?>
-                    </div>
-                </div>
-            </div>
-            <?php endforeach; $__env->popLoop(); $loop = $__env->getLastLoop(); ?>
-        </div>
-        <!-- /.box-body -->
-
-        <div class="box-footer">
-            <div class="row">
-                <div class="col-md-<?php echo e($layout->columns()->first()->width(), false); ?>">
-                    <div class="col-md-2"></div>
-                    <div class="col-md-8">
-                        <div class="btn-group pull-left">
-                            <button class="btn btn-info submit btn-sm"><i
-                                        class="fa fa-search"></i>&nbsp;&nbsp;<?php echo e(trans('admin.search'), false); ?></button>
-                        </div>
-                        <div class="btn-group pull-left " style="margin-left: 10px;">
-                            <a href="<?php echo $action; ?>" class="btn btn-default btn-sm"><i
-                                        class="fa fa-undo"></i>&nbsp;&nbsp;<?php echo e(trans('admin.reset'), false); ?></a>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-
-    </form>
-</div>
-<?php /**PATH /home/wwwroot/pingan/vendor/encore/laravel-admin/src/../resources/views/filter/container.blade.php ENDPATH**/ ?>

storage/framework/views/49579146699ce73739ebd0ab1f15346a7448ba2b.php

@@ -1,39 +0,0 @@
-<div class="<?php echo e($viewClass['form-group'], false); ?> <?php echo !$errors->has($column) ?: 'has-error'; ?>">
-
-    <label for="<?php echo e($id, false); ?>" class="<?php echo e($viewClass['label'], false); ?> control-label"><?php echo e($label, false); ?></label>
-
-    <div class="<?php echo e($viewClass['field'], false); ?>" id="<?php echo e($id, false); ?>">
-
-        <?php if($canCheckAll): ?>
-            <span class="icheck">
-            <label class="checkbox-inline">
-                <input type="checkbox" class="<?php echo e($checkAllClass, false); ?>"/>&nbsp;<?php echo e(__('admin.all'), false); ?>
-
-            </label>
-            </span>
-            <hr style="margin-top: 10px;margin-bottom: 0;">
-        <?php endif; ?>
-
-        <?php echo $__env->make('admin::form.error', \Illuminate\Support\Arr::except(get_defined_vars(), ['__data', '__path']))->render(); ?>
-
-        <?php $__currentLoopData = $options; $__env->addLoop($__currentLoopData); foreach($__currentLoopData as $option => $label): $__env->incrementLoopIndices(); $loop = $__env->getLastLoop(); ?>
-
-            <?php echo $inline ? '<span class="icheck">' : '<div class="checkbox icheck">'; ?>
-
-
-                <label <?php if($inline): ?>class="checkbox-inline"<?php endif; ?>>
-                    <input type="checkbox" name="<?php echo e($name, false); ?>[]" value="<?php echo e($option, false); ?>" class="<?php echo e($class, false); ?>" <?php echo e(false !== array_search($option, array_filter(old($column, $value ?? []))) || ($value === null && in_array($option, $checked)) ?'checked':'', false); ?> <?php echo $attributes; ?> />&nbsp;<?php echo e($label, false); ?>&nbsp;&nbsp;
-                </label>
-
-            <?php echo $inline ? '</span>' :  '</div>'; ?>
-
-
-        <?php endforeach; $__env->popLoop(); $loop = $__env->getLastLoop(); ?>
-
-        <input type="hidden" name="<?php echo e($name, false); ?>[]">
-
-        <?php echo $__env->make('admin::form.help-block', \Illuminate\Support\Arr::except(get_defined_vars(), ['__data', '__path']))->render(); ?>
-
-    </div>
-</div>
-<?php /**PATH /home/wwwroot/pingan/vendor/encore/laravel-admin/src/../resources/views/form/checkbox.blade.php ENDPATH**/ ?>

storage/framework/views/4b33bba7fa5d462b9bd9328a0a9cccaf88a0140a.php

@@ -1,59 +0,0 @@
-<?php $__env->startSection('title', '修改密码'); ?>
-
-<?php $__env->startSection('content'); ?>
-<form class="form-horizontal" method="post" action="<?php echo e(route('merchant.setting.password'), false); ?>">
-
-    <div class="form-group">
-        <label class="col-xs-3 control-label">新密码</label>
-        <div class="col-xs-8">
-            <input type="password" class="form-control" value="" name="password">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="col-xs-3 control-label">确认密码</label>
-        <div class="col-xs-8">
-            <input type="password" class="form-control" value="" name="password_confirmation">
-        </div>
-    </div>
-    <div class="form-group">
-        <div class="col-xs-offset-3 col-xs-8">
-            <?php echo csrf_field(); ?>
-
-            <button class="btn btn-primary btn-block ajax" type="button">
-                <i class="icon icon-check"></i> 保存
-            </button>
-        </div>
-    </div>
-</form>
-<?php $__env->stopSection(); ?>
-
-
-<?php $__env->startPush('script'); ?>
-    <script type="text/javascript">
-    $('body').on('click', '.ajax', function(event) {
-        if ($(this).hasClass('disabled') || $(this).attr('disabled')) {
-            return false;
-        };
-        event.preventDefault();
-        var $this   = $(this);
-        var $form   = $this.parents('form');
-        var $action = $form.attr("action");
-
-        $this.attr('disabled', 'disabled');
-        var query = $form.serialize();
-        $.post($action, query, function(res) {
-            $this.removeAttr('disabled');
-            if (res.code) {
-                parent.updateAlert(res.msg, res.code, function() {
-                    var index = parent.layer.getFrameIndex(window.name);
-                    parent.layer.close(index);
-                });
-            } else {
-                parent.updateAlert(res.msg, res.code);
-            }
-        });
-    });
-</script>
-<?php $__env->stopPush(); ?>
-
-<?php echo $__env->make('Merchant::layouts.app', \Illuminate\Support\Arr::except(get_defined_vars(), ['__data', '__path']))->render(); ?><?php /**PATH /home/wwwroot/pingan/app/Merchant/Resources/views/setting/password.blade.php ENDPATH**/ ?>