调整

.gitignore

@@ -3,4 +3,8 @@
 .editorconfig
 .env
 /vendor
-/storage/
+/storage/app
+/storage/logs
+/storage/framework
+/storage/debugbar/
+/bootstrap/cache

README

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

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

@@ -73,7 +73,7 @@ class IndexController extends AdminController
     protected function grid()
     {
         $grid = new Grid(new Activity);
-
+        $grid->model()->with(['grants.user', 'verifications.user']);
         $grid->actions(function ($actions) {
             $actions->disableView();
         });

app/Admin/Controllers/Activity/LogController.php

@@ -69,20 +69,20 @@ class LogController extends AdminController
         $grid->column('id', '#ID#');
         $grid->column('code', '卡券编号');
         $grid->column('type', '分类')
-             ->using(ActivityCouponLog::TYPES)
+            ->using(ActivityCouponLog::TYPES)
-             ->label([
+            ->label([
-                 1 => 'default',
+                        1 => 'default',
-                 2 => 'warning',
+                        2 => 'warning',
-                 3 => 'info',
+                        3 => 'info',
-             ]);
+                    ]);
 
         $grid->column('status', '状态')
-             ->using(ActivityCouponLog::STATUS)
+            ->using(ActivityCouponLog::STATUS)
-             ->label([
+            ->label([
-                 1 => 'default',
+                        1 => 'default',
-                 2 => 'warning',
+                        2 => 'warning',
-                 3 => 'info',
+                        3 => 'info',
-             ]);
+                    ]);
 
         $grid->column('remark', '处理结果');
 

app/Admin/Controllers/Activity/RuleController.php

@@ -54,25 +54,27 @@ class RuleController extends AdminController
 
         $form->switch('status', '状态')->default(1);
         $form->saving(function (Form $form) {
-            $code = $form->code;
+            if ($form->code) {
+                $code = $form->code;
 
-            $ticket = explode('-', $code);
+                $ticket = explode('-', $code);
-            if (!is_array($ticket) || count($ticket) != 3) {
+                if (!is_array($ticket) || count($ticket) != 3) {
-                $error = new MessageBag([
+                    $error = new MessageBag([
-                    'title'   => '错误',
+                        'title'   => '错误',
-                    'message' => '规则编号格式错误',
+                        'message' => '规则编号格式错误',
-                ]);
+                    ]);
 
-                return back()->withInput()->with(compact('error'));
+                    return back()->withInput()->with(compact('error'));
+                }
+
+                $full  = $ticket[1]; //full100
+                $price = $ticket[2];
+                preg_match('/\d+/', $full, $match);
+
+                $form->full = $match[0];
+                $form->take = $price;
             }
 
-            $full  = $ticket[1]; //full100
-            $price = $ticket[2];
-            preg_match('/\d+/', $full, $match);
-
-            $form->full = $match[0];
-            $form->take = $price;
-
         });
 
         return $form;

app/Admin/Controllers/Finance/CensusController.php

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

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()
-                    $query->where('identity_id', 1);
+                             ->whereHas('identity', function ($query) {
-                })->get()->pluck('nickname', 'id');
+                                 $query->where('identity_id', 1);
-                
+                             })
+                             ->get()
+                             ->pluck('nickname', 'id');
                 $filter->equal('user_id', '渠道')->select($users);
             });
             $filter->column(1 / 2, function ($filter) {

app/Admin/Controllers/HomeController.php

@@ -17,86 +17,186 @@ class HomeController extends Controller
     {
 
         return $content
-            ->title('数据看版1')
+            ->title('数据看版2')
             ->row(function (Row $row) {
                 $row->column(2, function (Column $column) {
-                    $column->append(new InfoBox('渠道商', 'users', 'yellow', '/admin/users?identity[identity_id]=1', User::whereHas('identity', function ($q) {$q->where('identity_id', 1);})->count()));
+                    $column->append(new InfoBox(
+                        '渠道商',
+                        'users',
+                        'yellow',
+                        '/admin/users?identity[identity_id]=1',
+                        User::whereHas('identity', function ($q) {
+                            $q->where('identity_id', 1);
+                        })->count()
+                    ));
                 });
-
             })
             ->row(function (Row $row) {
                 $row->column(2, function (Column $column) {
-                    $column->append(new InfoBox('核销卡券总数', '', 'blue', '/admin/coupons', Coupon::whereIn('status', [2, 3])->count()));
+                    $column->append(new InfoBox(
-                });
+                        '核销卡券总数',
-
+                        '',
-                $row->column(2, function (Column $column) {
+                        'blue',
-                    $column->append(new InfoBox('核销成功', '', 'blue', '/admin/coupons', Coupon::where('status', 2)->count()));
+                        '/admin/coupons',
+                        Coupon::whereIn('status', [2, 3])->count()
+                    ));
                 });
                 $row->column(2, function (Column $column) {
-                    $column->append(new InfoBox('核销失败', '', 'black', '/admin/coupons', Coupon::where('status', 3)->count()));
+                    $column->append(new InfoBox(
+                        '核销成功',
+                        '',
+                        'blue',
+                        '/admin/coupons',
+                        Coupon::where('status', 2)->count()
+                    ));
                 });
                 $row->column(2, function (Column $column) {
-                    $column->append(new InfoBox('资金通道结算', '', 'red', '/admin/coupons', Coupon::where('status', 2)->sum('price')));
+                    $column->append(new InfoBox(
+                        '核销失败',
+                        '',
+                        'black',
+                        '/admin/coupons',
+                        Coupon::where('status', 3)->count()
+                    ));
                 });
                 $row->column(2, function (Column $column) {
-                    $column->append(new InfoBox('应打款金额', '', 'green', '/admin/coupons', Coupon::where('status', 2)->sum('profit')));
+                    $column->append(new InfoBox(
+                        '资金通道结算',
+                        '',
+                        'red',
+                        '/admin/coupons',
+                        Coupon::where('status', 2)->sum('price')
+                    ));
                 });
                 $row->column(2, function (Column $column) {
-                    $column->append(new InfoBox('已打款金额', '', 'green', '/admin/coupons', Coupon::where('status', 2)->where('is_profit', 1)->sum('profit')));
+                    $column->append(new InfoBox(
+                        '应打款金额',
+                        '',
+                        'green',
+                        '/admin/coupons',
+                        Coupon::where('status', 2)->sum('profit')
+                    ));
+                });
+                $row->column(2, function (Column $column) {
+                    $column->append(new InfoBox(
+                        '已打款金额',
+                        '',
+                        'green',
+                        '/admin/coupons',
+                        Coupon::where('status', 2)
+                              ->where('is_profit', 1)
+                              ->sum('profit')
+                    ));
                 });
             })
             ->row(function (Row $row) {
 
-                $coupons = Coupon::where('status', 2)
-                    ->whereDate('created_at', now()->format('Y-m-d'))
-                    ->get();
                 $lists = [
-                    'ysd10'  => $coupons->where('thirdPartyGoodsId', 'YSD-full100-10')->count(),
+                    'ysd10'  => Coupon::where('status', 2)
-                    'ysd25'  => $coupons->where('thirdPartyGoodsId', 'YSD-full100-25')->count(),
+                                      ->whereDate('created_at', now()->format('Y-m-d'))
-                    'ysd50'  => $coupons->where('thirdPartyGoodsId', 'YSD-full100-50')->count(),
+                                      ->where('thirdPartyGoodsId', 'YSD-full100-10')
-                    'ysd100' => $coupons->where('thirdPartyGoodsId', 'YSD-full200-100')->count(),
+                                      ->count(),
+                    'ysd25'  => Coupon::where('status', 2)
+                                      ->whereDate('created_at', now()->format('Y-m-d'))
+                                      ->where('thirdPartyGoodsId', 'YSD-full100-25')
+                                      ->count(),
+                    'ysd50'  => Coupon::where('status', 2)
+                                      ->whereDate('created_at', now()->format('Y-m-d'))
+                                      ->where('thirdPartyGoodsId', 'YSD-full100-50')
+                                      ->count(),
+                    'ysd100' => Coupon::where('status', 2)
+                                      ->whereDate('created_at', now()->format('Y-m-d'))
+                                      ->where('thirdPartyGoodsId', 'YSD-full200-100')
+                                      ->count(),
                 ];
 
                 $row->column(2, function (Column $column) use ($lists) {
-                    $column->append(new InfoBox('100元减10元成功今日总数', '', 'blue', '/admin/coupons', $lists['ysd10']));
+                    $column->append(new InfoBox(
+                        '100元减10元成功今日总数',
+                        '',
+                        'blue',
+                        '/admin/coupons',
+                        $lists['ysd10']
+                    ));
                 });
 
                 $row->column(2, function (Column $column) use ($lists) {
-                    $column->append(new InfoBox('100元减25元成功今日总数', '', 'blue', '/admin/coupons', $lists['ysd25']));
+                    $column->append(new InfoBox(
+                        '100元减25元成功今日总数',
+                        '',
+                        'blue',
+                        '/admin/coupons',
+                        $lists['ysd25']
+                    ));
                 });
 
                 $row->column(2, function (Column $column) use ($lists) {
-                    $column->append(new InfoBox('100元减50元成功今日总数', '', 'blue', '/admin/coupons', $lists['ysd50']));
+                    $column->append(new InfoBox(
+                        '100元减50元成功今日总数',
+                        '',
+                        'blue',
+                        '/admin/coupons',
+                        $lists['ysd50']
+                    ));
                 });
 
                 $row->column(2, function (Column $column) use ($lists) {
-                    $column->append(new InfoBox('200元减100元成功今日总数', '', 'blue', '/admin/coupons', $lists['ysd100']));
+                    $column->append(new InfoBox(
+                        '200元减100元成功今日总数',
+                        '',
+                        'blue',
+                        '/admin/coupons',
+                        $lists['ysd100']
+                    ));
                 });
             })
             ->row(function (Row $row) {
 
-                $coupons = Coupon::where('status', 2)->get();
+                $lists = [
-                $lists   = [
+                    'ysd10'  => Coupon::where('status', 2)->where('thirdPartyGoodsId', 'YSD-full100-10')->count(),
-                    'ysd10'  => $coupons->where('thirdPartyGoodsId', 'YSD-full100-10')->count(),
+                    'ysd25'  => Coupon::where('status', 2)->where('thirdPartyGoodsId', 'YSD-full100-25')->count(),
-                    'ysd25'  => $coupons->where('thirdPartyGoodsId', 'YSD-full100-25')->count(),
+                    'ysd50'  => Coupon::where('status', 2)->where('thirdPartyGoodsId', 'YSD-full100-50')->count(),
-                    'ysd50'  => $coupons->where('thirdPartyGoodsId', 'YSD-full100-50')->count(),
+                    'ysd100' => Coupon::where('status', 2)->where('thirdPartyGoodsId', 'YSD-full200-100')->count(),
-                    'ysd100' => $coupons->where('thirdPartyGoodsId', 'YSD-full200-100')->count(),
                 ];
 
                 $row->column(2, function (Column $column) use ($lists) {
-                    $column->append(new InfoBox('100元减10元成功总数', '', 'blue', '/admin/coupons', $lists['ysd10']));
+                    $column->append(new InfoBox(
+                        '100元减10元成功总数',
+                        '',
+                        'blue',
+                        '/admin/coupons',
+                        $lists['ysd10']
+                    ));
                 });
 
                 $row->column(2, function (Column $column) use ($lists) {
-                    $column->append(new InfoBox('100元减25元成功总数', '', 'blue', '/admin/coupons', $lists['ysd25']));
+                    $column->append(new InfoBox(
+                        '100元减25元成功总数',
+                        '',
+                        'blue',
+                        '/admin/coupons',
+                        $lists['ysd25']
+                    ));
                 });
 
                 $row->column(2, function (Column $column) use ($lists) {
-                    $column->append(new InfoBox('100元减50元成功总数', '', 'blue', '/admin/coupons', $lists['ysd50']));
+                    $column->append(new InfoBox(
+                        '100元减50元成功总数',
+                        '',
+                        'blue',
+                        '/admin/coupons',
+                        $lists['ysd50']
+                    ));
                 });
 
                 $row->column(2, function (Column $column) use ($lists) {
-                    $column->append(new InfoBox('200元减100元成功总数', '', 'blue', '/admin/coupons', $lists['ysd100']));
+                    $column->append(new InfoBox(
+                        '200元减100元成功总数',
+                        '',
+                        'blue',
+                        '/admin/coupons',
+                        $lists['ysd100']
+                    ));
                 });
             });
     }

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->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) {
+        })->modal(ServerKey::class);
-            $data = [
-                [
-                    '服务秘钥', $model->server_key ?? '---',
-                ],
-                [
-                    'DES3秘钥', $model->des3key ?? '---',
-                ],
-            ];
-
-            return new Table(['名称', '参数'], $data);
-
-        });
 
         $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) {
+        })->modal(Rule::class);
-            if ($model->code) {
-                $codes = $model->code->map(function ($code) {
-                    return $code->only(['name', 'code', 'profit']);
-                });
-
-                return new Table(['名称', '规则项', '分润金额(元)'], $codes->toArray());
-            }
-
-        });
 
         $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/UnionPayController.php

@@ -0,0 +1,53 @@
+<?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();
+        $sign   = $inputs['sign'];
+        unset($inputs['sign']);
+        $action = new UnionPay($inputs, $sign);
+
+        $action->addLog();
+        $action->start();
+
+        $action->updateLog();
+
+        return $action->respond();
+
+    }
+
+}

app/Api/routes.php

@@ -18,4 +18,9 @@ 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,8 +26,7 @@ class Handler extends ExceptionHandler
 
     /**
      * Report or log an exception.
-     *
+     * @param \Exception $exception
-     * @param  \Exception  $exception
      * @return void
      */
     public function report(Exception $exception)
@@ -39,13 +36,13 @@ class Handler extends ExceptionHandler
 
     /**
      * Render an exception into an HTTP response.
-     *
+     * @param \Illuminate\Http\Request $request
-     * @param  \Illuminate\Http\Request  $request
+     * @param \Exception               $exception
-     * @param  \Exception  $exception
      * @return \Illuminate\Http\Response
      */
     public function render($request, Exception $exception)
     {
         return parent::render($request, $exception);
     }
+
 }

app/Http/Controllers/TestController.php

@@ -3,53 +3,37 @@
 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;
+        $user_id = $request->user_id;
-        //        $data       = $request->data;
+        $data = $request->data;
-        //        $this->user = User::find(3);
+        $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);
-        $ret              = [
-            'variable' => 100,
-            'mobile'   => 15663876870,
-            'type'     => 'silver',
-            'remark'   => '测试',
-        ];
-        $res['server_id'] = $this->user->server_id;
-        $res['des']       = $this->user->des3key;
-        $res['key']       = $this->user->server_key;
 
-        return $this->success($ret);
+        $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(215);
-        $ret        = [
+        $ret = [
             'redemptionCode' => '951951858070',
             'total'          => 5,
-            'outletId'       => '2008241014458',
+            'outletId'       => '2006151433887',
         ];
 
         return $this->success($ret);
@@ -111,7 +95,7 @@ class TestController
         $this->user = User::find(3);
 
         $redemptionCode = $request->redemptionCode;
-        $outletId       = $request->outletId;
+        $outletId = $request->outletId;
 
         $data = $this->jiami($request->all());
 
@@ -137,7 +121,7 @@ class TestController
         $this->user = User::find(3);
 
         $redemptionCode = $request->redemptionCode;
-        $data           = $this->jiami($request->all());
+        $data = $this->jiami($request->all());
 
         $url = $this->baseUrl . 'user/destroy';
         $res = $this->http($data, $url);
@@ -164,11 +148,11 @@ class TestController
         $this->user = User::find($user_id);
 
         $data = $this->jiami([
-            'redemptionCode' => $request->redemptionCode,
+                                 'redemptionCode' => $request->redemptionCode,
-            'total'          => $request->total,
+                                 'total'          => $request->total,
-            'outletId'       => $request->outletId,
+                                 'outletId'       => $request->outletId,
-            'orderid'        => $request->orderid,
+                                 'orderid'        => $request->orderid,
-        ]);
+                             ]);
 
         $url = $this->baseUrl . 'user/freezecoupon';
         $res = $this->http($data, $url);
@@ -176,10 +160,10 @@ class TestController
         return $res;
 
         $redemptionCode = $request->redemptionCode;
-        $total          = $request->total;
+        $total = $request->total;
-        $outletId       = $request->outletId;
+        $outletId = $request->outletId;
-        $orderid        = $request->orderid ?? '';
+        $orderid = $request->orderid ?? '';
-        $res            = Coupon::Redemption($this->user, $redemptionCode, $total, $outletId, $orderid);
+        $res = Coupon::Redemption($this->user, $redemptionCode, $total, $outletId, $orderid);
 
         if (is_string($res)) {
             return $this->error($res);
@@ -190,22 +174,22 @@ class TestController
 
     public function http($data, $url)
     {
-        $client   = new Client();
+        $client = new Client();
         $response = $client->request('POST', $url, ['form_params' => $data, 'http_errors' => false]);
 
-        $body    = $response->getBody();
+        $body = $response->getBody();
         $content = $body->getContents();
-        $result  = json_decode($content, true);
+        $result = json_decode($content, true);
 
         return $result;
     }
 
     public function jiami($ret)
     {
-        $jsonData = json_encode($ret);                     //数据JSON化
+        $jsonData = json_encode($ret); //数据JSON化
-        $ascdata  = $this->keyasc($jsonData);              //加密
+        $ascdata = $this->keyasc($jsonData); //加密
-        $addcode  = sprintf("%08d", mt_rand(0, 99999999)); //随机code 验证签名用
+        $addcode = sprintf("%08d", mt_rand(0, 99999999)); //随机code 验证签名用
-        $sign     = $this->keysign($ascdata, $addcode);
+        $sign = $this->keysign($ascdata, $addcode);
 
         $data = [
             'server_id' => $this->user->server_id,
@@ -225,7 +209,7 @@ class TestController
      */
     public function jiemi($value)
     {
-        $iv  = substr($this->user->des3key, 0, 8);
+        $iv = substr($this->user->des3key, 0, 8);
         $ret = openssl_decrypt($value, 'DES - EDE3 - CBC', $this->user->des3key, 0, $iv);
         if (false === $ret) {
             return openssl_error_string();
@@ -234,7 +218,7 @@ class TestController
         return $ret;
     }
 
-    function getMemoryUsage($precision = 2)
+    public function getMemoryUsage($precision = 2)
     {
         $size = memory_get_usage(true);
 
@@ -243,7 +227,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

@@ -6,6 +6,7 @@ use App\Events\ConponCallback;
 use App\Models\ActivityCouponLog;
 use GuzzleHttp\Client;
 use Illuminate\Contracts\Queue\ShouldQueue;
+use RuntimeException;
 
 class ConponCallbackListener implements ShouldQueue
 {
@@ -55,6 +56,7 @@ class ConponCallbackListener implements ShouldQueue
                 $data['remark'] = '接口错误';
                 $error          = true;
             }
+
             ActivityCouponLog::create($data);
 
             if ($error) {

app/Models/Activity.php

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

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)
@@ -129,12 +127,12 @@ class User extends Authenticatable
     public function getCouponCount($type, $date = '')
     {
         return $this->coupons()
-            ->whereIn('status', [2])
+                    ->whereIn('status', [2])
-            ->where('thirdPartyGoodsId', $type)
+                    ->where('thirdPartyGoodsId', $type)
-            ->when($date, function ($q) {
+                    ->when($date, function ($q) {
-                $q->whereDate('created_at', now()->format('Y-m-d'));
+                        $q->whereDate('created_at', now()->format('Y-m-d'));
-            })
+                    })
-            ->count();
+                    ->count();
     }
 
 }

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' => 
@@ -21,17 +21,6 @@
       'Admin' => 'Encore\\Admin\\Facades\\Admin',
     ),
   ),
-  'facade/ignition' => 
-  array (
-    'providers' => 
-    array (
-      0 => 'Facade\\Ignition\\IgnitionServiceProvider',
-    ),
-    'aliases' => 
-    array (
-      'Flare' => 'Facade\\Ignition\\Facades\\Flare',
-    ),
-  ),
   'fideloper/proxy' => 
   array (
     'providers' => 
@@ -82,24 +71,6 @@
       0 => 'Carbon\\Laravel\\ServiceProvider',
     ),
   ),
-  'nunomaduro/collision' => 
-  array (
-    'providers' => 
-    array (
-      0 => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider',
-    ),
-  ),
-  'overtrue/laravel-wechat' => 
-  array (
-    'providers' => 
-    array (
-      0 => 'Overtrue\\LaravelWeChat\\ServiceProvider',
-    ),
-    'aliases' => 
-    array (
-      'EasyWeChat' => 'Overtrue\\LaravelWeChat\\Facade',
-    ),
-  ),
   'simplesoftwareio/simple-qrcode' => 
   array (
     'providers' => 

bootstrap/cache/services.php

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

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",
@@ -27,6 +28,7 @@
         "fzaninotto/faker": "^1.4",
         "mockery/mockery": "^1.0",
         "nunomaduro/collision": "^3.0",
+        "overtrue/laravel-query-logger": "^2.0",
         "phpunit/phpunit": "^8.0"
     },
     "config": {
@@ -44,10 +46,13 @@
             "App\\": "app/",
             "RuLong\\Bonus\\": "packages/bonus/src/",
             "RuLong\\Identity\\": "packages/identity/src/",
-            "XuanChen\\Coupon\\": "packages/coupon/src/"
+            "XuanChen\\Coupon\\": "packages/coupon/src/",
+            "XuanChen\\UnionPay\\": "packages/unionpay/src/",
+            "XuanChen\\Sinopec\\": "packages/sinopec/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

@@ -36,36 +36,36 @@ return [
 
     'channels' => [
         'stack' => [
-            'driver' => 'stack',
+            'driver'            => 'stack',
-            'channels' => ['daily'],
+            'channels'          => ['daily'],
             'ignore_exceptions' => false,
         ],
 
         'single' => [
             'driver' => 'single',
-            'path' => storage_path('logs/laravel.log'),
+            'path'   => storage_path('logs/laravel.log'),
-            'level' => 'debug',
+            'level'  => 'debug',
         ],
 
         'daily' => [
             'driver' => 'daily',
-            'path' => storage_path('logs/laravel.log'),
+            'path'   => storage_path('logs/laravel.log'),
-            'level' => 'debug',
+            'level'  => 'debug',
-            'days' => 14,
+            'days'   => 14,
         ],
 
         'slack' => [
-            'driver' => 'slack',
+            'driver'   => 'slack',
-            'url' => env('LOG_SLACK_WEBHOOK_URL'),
+            'url'      => env('LOG_SLACK_WEBHOOK_URL'),
             'username' => 'Laravel Log',
-            'emoji' => ':boom:',
+            'emoji'    => ':boom:',
-            'level' => 'critical',
+            'level'    => 'critical',
         ],
 
         'papertrail' => [
-            'driver' => 'monolog',
+            'driver'       => 'monolog',
-            'level' => 'debug',
+            'level'        => 'debug',
-            'handler' => SyslogUdpHandler::class,
+            'handler'      => SyslogUdpHandler::class,
             'handler_with' => [
                 'host' => env('PAPERTRAIL_URL'),
                 'port' => env('PAPERTRAIL_PORT'),
@@ -73,28 +73,35 @@ return [
         ],
 
         'stderr' => [
-            'driver' => 'monolog',
+            'driver'    => 'monolog',
-            'handler' => StreamHandler::class,
+            'handler'   => StreamHandler::class,
             'formatter' => env('LOG_STDERR_FORMATTER'),
-            'with' => [
+            'with'      => [
                 'stream' => 'php://stderr',
             ],
         ],
 
         'syslog' => [
             'driver' => 'syslog',
-            'level' => 'debug',
+            'level'  => 'debug',
         ],
 
         'errorlog' => [
             'driver' => 'errorlog',
-            'level' => 'debug',
+            'level'  => 'debug',
         ],
 
         'null' => [
-            'driver' => 'monolog',
+            'driver'  => 'monolog',
             '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/unionpay.php

@@ -0,0 +1,339 @@
+<?php
+
+return [
+    //分配的渠道号
+    'msg_sender'  => '660134',
+    //打印在小票上，由活动标题、优惠金额、原始金额组合而成
+    'pos_receipt' => '本时生活，优惠生活',
+    //广告，用于打印在小票上
+    'pos_ad'      => '',
+    //营销联盟广告，用于打印在小票上
+    'pos_mkt_ad'  => '本时生活，优惠生活',
+    //银联渠道id
+    'agent_id'    => '299',
+    //银联网点id
+    'outlet_id'   => '2009300919918',
+    //用于银商与sp分润的金额(是佣金的一部分), 以分为单位
+    'serv_chg'    => 0,
+    //佣金
+    'commission'  => 0,
+    //证书
+    'check'       => [
+        'self'     => [
+            'private' => storage_path('cert/unionpay/self/private_rsa.pem'),
+            'public'  => storage_path('cert/unionpay/self/public_rsa.pem'),
+        ],
+        'unionpay' => [
+            'public' => storage_path('cert/unionpay/public_rsa.pem'),
+        ],
+    ],
+    'type'        => [
+        '002025' => '查询',
+        '002100' => '交易',
+        '002101' => '冲正',
+        '002102' => '撤销',
+    ],
+    'log_type'    => [
+        '002025' => 'query',
+        '002100' => 'freezecoupon',
+        '002101' => 'reversal',
+        '002102' => 'annul',
+    ],
+    //需要校验的数据
+    'validator'   => [
+        '002025' => [
+            "msg_type",
+            "msg_txn_code",
+            "msg_crrltn_id",
+            "msg_flg",
+            "msg_sender",
+            "msg_time",
+            "msg_ver",
+            "msg_sys_sn",
+            "req_serial_no",
+            "mkt_code",
+            "amount",
+            "avl_amt",
+        ],
+        '002100' => [
+            "msg_type",
+            "msg_txn_code",
+            "msg_crrltn_id",
+            "msg_flg",
+            "msg_sender",
+            "msg_time",
+            "msg_sys_sn",
+            "msg_ver",
+            "req_serial_no",
+            "orig_req_serial_no",
+            "sett_date",
+            "txn_date",
+            "txn_time",
+            "orig_amt",
+            "discount_amt",
+        ],
+        '002101' => [
+            "msg_type",
+            "msg_txn_code",
+            "msg_crrltn_id",
+            "msg_flg",
+            "msg_sender",
+            "msg_time",
+            "msg_sys_sn",
+            "msg_ver",
+            "req_serial_no",
+            "orig_req_serial_no",
+        ],
+        '002102' => [
+            "msg_type",
+            "msg_txn_code",
+            "msg_crrltn_id",
+            "msg_flg",
+            "msg_sender",
+            "msg_time",
+            "msg_sys_sn",
+            "msg_ver",
+            "req_serial_no",
+            "orig_req_serial_no",
+        ],
+    ],
+    //入库基础数据
+    'regular'     => [
+        '002025' => [
+            "msg_type",
+            "msg_txn_code",
+            "msg_crrltn_id",
+            //            "msg_flg",
+            "msg_sender",
+            "msg_time",
+            "msg_ver",
+            "msg_sys_sn",//自己添加的基础数据
+            "req_serial_no",//自己添加的基础数据
+            "mkt_code",//自己添加的基础数据
+        ],
+        '002100' => [
+            "msg_type",
+            "msg_txn_code",
+            "msg_crrltn_id",
+            //            "msg_flg",
+            "msg_sender",
+            "msg_time",
+            "msg_sys_sn",
+            "msg_ver",
+            "req_serial_no",//自己添加的基础数据
+            "orig_req_serial_no",//自己添加的基础数据
+            "sett_date",//自己添加的基础数据
+        ],
+        '002101' => [
+            "msg_type",
+            "msg_txn_code",
+            "msg_crrltn_id",
+            //            "msg_flg",
+            "msg_sender",
+            "msg_time",
+            "msg_sys_sn",
+            "msg_ver",
+            "req_serial_no",//自己添加的基础数据
+            "orig_req_serial_no",//自己添加的基础数据
+        ],
+        '002102' => [
+            "msg_type",
+            "msg_txn_code",
+            "msg_crrltn_id",
+            //            "msg_flg",
+            "msg_sender",
+            "msg_time",
+            "msg_sys_sn",
+            "msg_ver",
+            "req_serial_no",//自己添加的基础数据
+            "orig_req_serial_no",//自己添加的基础数据
+        ],
+    ],
+    'fields'      => [
+        //聚合营销优惠查询接口
+        '002025' => [
+            'in'  => [
+                "msg_type"          => "报文类型",
+                "msg_txn_code"      => "交易代码",
+                "msg_crrltn_id"     => "报文流水号",
+                "msg_flg"           => "报文请求应答标志",
+                "msg_sender"        => "报文发送方",
+                "msg_time"          => "报文日期",
+                "msg_sys_sn"        => "平台流水号",
+                "msg_ver"           => "报文版本号",
+                "req_serial_no"     => "查询流水号",
+                "shop_no"           => "门店号",
+                "term_no"           => "受理终端号",
+                "service_code"      => "受理方式",
+                "voucher_no"        => "受理凭证号",
+                "mkt_code"          => "聚合营销码",
+                "mkt_mode"          => "聚合营销类型",
+                "embedded_mchnt_no" => "发起渠道商户号",
+                "currency_code"     => "货币代码",
+                "amount"            => "消费金额",
+                "avl_amt"           => "可优惠金额",
+                "term_sp_chnl_no"   => "终端指定SP渠道号",
+                "func_code"         => "功能码",
+                "times"             => "次数",
+                "pay_mode"          => "支付方式",
+                //用户附加信息
+                "user_ext_info"     => [
+                    "mobile_no"      => "手机号",
+                    "user_code"      => "用户号",
+                    "user_code_type" => "用户号类型",
+                    "dev_id"         => "设备id",
+                ],
+                "sign"              => "签名域",
+            ],
+            'out' => [
+                "msg_type"      => "报文类型",
+                "msg_txn_code"  => "交易代码",
+                "msg_crrltn_id" => "报文流水号",
+                "msg_flg"       => "报文请求应答标志",
+                "msg_sender"    => "报文发送方",
+                "msg_time"      => "报文日期",
+                "msg_sys_sn"    => "平台流水号",
+                "msg_rsp_code"  => "响应码",
+                "msg_rsp_desc"  => "响应码描述",
+                "discount"      => "折扣金额",
+                "actual_amt"    => "折后应收金额",
+                "pos_display"   => "POS显示",
+                "pos_receipt"   => "POS小票",
+                "pos_ad"        => "POS广告",
+                "pos_mkt_ad"    => "Pos_营销联盟广告",
+                "sign"          => "签名域",
+            ],
+        ],
+        //销账交易接口
+        '002100' => [
+            'in'  => [
+                "msg_type"           => "报文类型",
+                "msg_txn_code"       => "交易代码",
+                "msg_crrltn_id"      => "消息关联号",
+                "msg_flg"            => "报文请求应答标志",
+                "msg_sender"         => "报文发送方",
+                "msg_time"           => "报文日期",
+                "msg_sys_sn"         => "平台流水号",
+                "msg_ver"            => "报文版本号",
+                "shop_no"            => "门店号",
+                "term_no"            => "终端号",
+                "req_serial_no"      => "销券流水号",
+                "orig_req_serial_no" => "原查询流水号",
+                "enc_card_no"        => "加密卡号",
+                "part_card_no"       => "部分卡号",
+                "acq_term_sn"        => "受理终端流水号",
+                "refer_no"           => "检索参考号",
+                "sett_date"          => "清算日期",
+                "txn_date"           => "交易日期",
+                "txn_time"           => "交易时间",
+                "orig_amt"           => "原始金额",
+                "discount_amt"       => "优惠的金额",
+                "pay_amt"            => "支付金额",
+                "pay_mode"           => "支付方式",
+                "order_no"           => "订单号",
+                "trans_crrltn_no"    => "交易关联流水号",
+                "equity_no"          => "权益号",
+                "card_no"            => "全卡号",
+                "sign"               => "签名数据",
+            ],
+            'out' => [
+                "msg_type"        => "报文类型",
+                "msg_txn_code"    => "交易代码",
+                "msg_crrltn_id"   => "消息关联号",
+                "msg_flg"         => "报文请求应答标志",
+                "msg_sender"      => "报文发送方",
+                "msg_time"        => "报文日期",
+                "msg_sys_sn"      => "平台流水号",
+                "msg_ver"         => "报文版本号",
+                "msg_rsp_code"    => "响应码",
+                "msg_rsp_desc"    => "响应码描述",
+                "orig_amt"        => "原始金额",
+                "discount_amt"    => "折扣金额",
+                "pay_amt"         => "支付金额",
+                "serv_chg"        => "服务费",
+                "commission"      => "佣金",
+                "ad"              => "广告",
+                "pos_receipt"     => "POS优惠",
+                "coupon_no"       => "凭证号",
+                "coupon_type"     => "凭证类型",
+                "sp_biz_code"     => "SP统计码",
+                "charge_code"     => "计费码",
+                "pos_event_title" => "SP活动主题",
+                "sp_contact"      => "SP联系电话",
+                "sp_name"         => "SP名称",
+                "event_no"        => "活动号",
+                "td_code"         => "二维码",
+                "memo"            => "附言",
+                "mkt_sp_chnl_no"  => "营销渠道号",
+                "point_amt"       => "积分抵扣金额",
+                "sign"            => "签名数据",
+            ],
+        ],
+        //销账冲正通知接口
+        '002101' => [
+            'in'  => [
+                "msg_type"           => "报文类型",
+                "msg_txn_code"       => "交易代码",
+                "msg_crrltn_id"      => "消息关联号",
+                "msg_flg"            => "报文请求应答标志",
+                "msg_sender"         => "报文发送方",
+                "msg_time"           => "报文日期",
+                "msg_sys_sn"         => "平台流水号",
+                "msg_ver"            => "报文版本号",
+                "shop_no"            => "门店号",
+                "term_no"            => "终端号",
+                "req_serial_no"      => "冲正流水号",
+                "orig_req_serial_no" => "原始销账流水号",
+                "trans_crrltn_no"    => "交易关联流水号",
+                "sign"               => "签名数据",
+            ],
+            'out' => [
+                "msg_type"      => "报文类型",
+                "msg_txn_code"  => "交易代码",
+                "msg_crrltn_id" => "消息关联号",
+                "msg_flg"       => "报文请求应答标志",
+                "msg_sender"    => "报文发送方",
+                "msg_time"      => "报文日期",
+                "msg_sys_sn"    => "平台流水号",
+                "msg_ver"       => "报文版本号",
+                "msg_rsp_code"  => "响应码",
+                "msg_rsp_desc"  => "响应码描述",
+                "sign"          => "签名数据",
+            ],
+        ],
+        '002102' => [
+            'in'  => [
+                "msg_type"           => "报文类型",
+                "msg_txn_code"       => "交易代码",
+                "msg_crrltn_id"      => "消息关联号",
+                "msg_flg"            => "报文请求应答标志",
+                "msg_sender"         => "报文发送方",
+                "msg_time"           => "报文日期",
+                "msg_sys_sn"         => "平台流水号",
+                "msg_ver"            => "报文版本号",
+                "shop_no"            => "门店号",
+                "term_no"            => "终端号",
+                "req_serial_no"      => "撤销流水号",
+                "orig_req_serial_no" => "原始销账流水号",
+                "trans_crrltn_no"    => "交易关联流水号",
+                "sign"               => "签名数据",
+            ],
+            'out' => [
+                "msg_type"      => "报文类型",
+                "msg_txn_code"  => "交易代码",
+                "msg_crrltn_id" => "消息关联号",
+                "msg_flg"       => "报文请求应答标志",
+                "msg_sender"    => "报文发送方",
+                "msg_time"      => "报文日期",
+                "msg_sys_sn"    => "平台流水号",
+                "msg_ver"       => "报文版本号",
+                "msg_rsp_code"  => "响应码",
+                "msg_rsp_desc"  => "响应码描述",
+                "ad"            => "广告",
+                "td_code"       => "二维码",
+                "sign"          => "签名数据",
+            ],
+        ],
+
+    ],
+];

config/xuanchen_coupon.php

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

packages/coupon/README.md

@@ -0,0 +1,8 @@
+# coupon 优惠券接口
+## 接口地址：http://pac.ysd-bs.com/api/V1
+
+
+### 发券地址：http://pac.ysd-bs.com/api/V1/user/grant
+### 查询接口：http://pa.ysd-bs.com/api/V1/user/query
+### 核销地址：http://pa.ysd-bs.com/api/V1/user/freezecoupon
+### 作废地址：http://pa.ysd-bs.com/api/V1/user/destroy

packages/coupon/composer.json

@@ -2,6 +2,7 @@
     "name": "xuanchen/coupon",
     "description": "卡券相关",
     "license": "MIT",
+    "homepage": "https://gitee.com/xdeepu/coupon",
     "authors": [
         {
             "name": "玄尘",

packages/coupon/src/Action/PinganAction.php

@@ -41,13 +41,19 @@ class PinganAction extends Init implements CouponContracts
     }
 
     //发券
-    function grant()
+    public function grant()
     {
         return '没这个接口';
     }
 
     //作废
-    function destroy()
+    public function destroy()
+    {
+        return '没这个接口';
+    }
+
+    //撤销
+    public function reversal()
     {
         return '没这个接口';
     }

packages/coupon/src/Action/YsdAction.php

@@ -5,6 +5,7 @@ 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\YsdReversal;
 use XuanChen\Coupon\Action\ysd\YsdVerification;
 use XuanChen\Coupon\Contracts\CouponContracts;
 
@@ -88,4 +89,17 @@ class YsdAction extends Init implements CouponContracts
                                            ->start();
     }
 
+    /**
+     * Notes: 撤销
+     * @Author: 玄尘
+     * @Date  : 2020/10/12 11:55
+     * @return array|string
+     */
+    public function reversal()
+    {
+        return $res = (new YsdReversal)->setCode($this->redemptionCode)
+                                       ->setOutletId($this->outletId)
+                                       ->start();
+    }
+
 }

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

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

packages/coupon/src/Coupon.php

@@ -88,20 +88,31 @@ class Coupon
     public static function getModelByCode($code)
     {
         $rules = config('xuanchen_coupon.rules');
+
         if (!$rules) {
-            return '系统出错，未找到配置文件';
+            throw new \Exception('系统出错，未找到配置文件');
         }
 
         $model = '';
         foreach ($rules as $rule) {
-            if (preg_match($rule['pattern'], $code, $matches)) {
+            if (is_array($rule['pattern']) && count($rule['pattern']) > 1) {
-                $model = $rule['model'];
+                foreach ($rule['pattern'] as $pattern) {
-                break;
+                    if (preg_match($pattern, $code, $matches)) {
+                        $model = $rule['model'];
+                        break;
+                    }
+                }
+            } else {
+                if (preg_match($rule['pattern'], $code, $matches)) {
+                    $model = $rule['model'];
+                    break;
+                }
             }
+
         }
 
         if (!$model) {
-            throw new \Exception('卡券核销失败。未查到卡券所属');
+            throw new \Exception('操作失败。未查到卡券所属');
         }
 
         return new $model;
@@ -141,4 +152,28 @@ class Coupon
 
     }
 
+    /**
+     * Notes: 冲正 撤销 已经核销的改为未核销状态
+     * @Author: 玄尘
+     * @Date  : 2020/10/12 11:54
+     * @param $redemptionCode
+     * @param $outletId
+     * @return string
+     */
+    public static function Reversal($redemptionCode, $outletId)
+    {
+        try {
+            $model = self::getModelByCode($redemptionCode);
+            if (is_string($model)) {
+                return $model;
+            }
+
+            return $model->setCode($redemptionCode)
+                         ->setOutletId($outletId)
+                         ->reversal();
+        } 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/sinopec/composer.json

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

packages/sinopec/config/xuanchen_coupon.php

@@ -0,0 +1,15 @@
+<?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\SinopecAction::class,
+        ],
+    ],
+];

packages/sinopec/src/Action/Init.php

@@ -0,0 +1,197 @@
+<?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/sinopec/src/Action/SinopecAction.php

@@ -0,0 +1,73 @@
+<?php
+
+namespace XuanChen\Coupon\Action;
+
+use XuanChen\Coupon\Action\sinopec\ZhyCreate;
+use XuanChen\Coupon\Contracts\CouponContracts;
+
+/**
+ * Class SinopecAction  中石化控制器
+ * @Author: 玄尘
+ * @Date: 2020/9/23 15:14
+ * @package XuanChen\Coupon\Action
+ */
+class SinopecAction extends Init implements CouponContracts
+{
+    /**
+     * Notes: 创建营销活动
+     * @Author: 玄尘
+     * @Date: 2020/9/23 16:01
+     * @param array $data
+     */
+    public function create(array $data)
+    {
+        $action = new ZhyCreate();
+        $action->data = $data;
+        
+        return $action->start();
+
+
+    }
+
+    /**
+     * Notes: 发券接口
+     * @Author: 玄尘
+     * @Date: 2020/9/23 15:58
+     */
+    function grant()
+    {
+        // TODO: Implement grant() method.
+    }
+
+    /**
+     * Notes: 查询接口
+     * @Author: 玄尘
+     * @Date: 2020/9/23 15:58
+     * @return mixed|void
+     */
+    function detail()
+    {
+        // TODO: Implement detail() method.
+    }
+
+    /**
+     * Notes: 作废接口
+     * @Author: 玄尘
+     * @Date: 2020/9/23 15:59
+     */
+    function destroy()
+    {
+        // TODO: Implement destroy() method.
+    }
+
+    /**
+     * Notes: 核销接口
+     * @Author: 玄尘
+     * @Date: 2020/9/23 16:00
+     * @return mixed|void
+     */
+    function start()
+    {
+        // TODO: Implement start() method.
+    }
+}

packages/sinopec/src/Action/sinopec/ZhyCreate.php

@@ -0,0 +1,82 @@
+<?php
+
+namespace XuanChen\Sinopec\Action\sinopec;
+
+use XuanChen\Sinopec\Contracts\CheckCouponContracts;
+
+class ZhyCreate implements CheckCouponContracts
+{
+
+    public $data;
+
+    public function start()
+    {
+
+        try {
+            [
+                "cooperativeMerchant"  => "",
+                "eletronAndRule"       => [
+                    [
+                        "entryMethod"           => "01",
+                        "marketCode"            => "20191213154203514",
+                        "marketRuleNumber"      => "001",
+                        "perVoucherNumber"      => "1",
+                        "planVoucherNumber"     => "10",
+                        "queryCreateTime"       => "2019-11-11 18:39:49",
+                        "similarStack"          => "Y",
+                        "voucherEndTime"        => "2019-12-15",
+                        "voucher_ruleCode"      => "$01-VC-1573468710381900",
+                        "voucherRuleName"       => "ceshi2",
+                        "voucherSource"         => "S01",
+                        "voucherStartTime"      => "2019-12-13",
+                        "voucherStartTime_type" => "VOUCHER_START_TIME_TYPE_ABSOLUTE_EFFECTIVE_TIME",
+                    ],
+                ],
+                "limitFrequency"       => "",
+                "mabIsRefund"          => "",
+                "marketCode"           => "20191213154203514",
+                "marketExEndTime"      => "2019-12-15 00:00:00",
+                "marketExStartTime"    => "2019-12-13 00:00:00",
+                "marketHierarchy"      => "3311",
+                "marketName"           => "行为推送活动-3",
+                "marketProvince"       => "51",
+                "marketReleaseSys"     => "VOUCHER_PUBLISH_TYPE_APPLET",
+                "marketStatus"         => "MARKET_ACTIVITY_STATE_TAKE_EFFECT",
+                "promotionCalculation" => "PROMOTION_TYPE_MEMBER_BEHAVIOR",
+                "rule"                 => [
+                    [
+                        "cashValue"         => "100",
+                        "channel"           => "C01,C02,C03,C05",
+                        "fullType"          => "",
+                        "marketCode"        => "20191213154203514",
+                        "perVoucherNumber"  => "1",
+                        "planVoucherNumber" => "10",
+                        "ruleCode"          => "$01-VC-1573468710381900",
+                        "ruleDetail"        => "123123",
+                        "ruleName"          => "ceshi2",
+                        "voucherType"       => "C01",
+                    ],
+                ],
+                "tradLimit"            => [
+                    [
+                        "endValue"         => "",
+                        "fixed"            => "",
+                        "marketCode"       => "20191213154203514",
+                        "marketRuleName"   => "001",
+                        "marketRuleNumber" => "001",
+                        "memLevel"         => "",
+                        "operator"         => "",
+                        "startValue"       => "",
+                        "tradingUnit"      => "",
+                        "transactionType"  => "",
+                    ],
+                ],
+            ];
+
+        } catch (\Exception $e) {
+            return $e->getMessage();
+        }
+
+    }
+
+}

packages/sinopec/src/Action/sinopec/ZhyQuery.php

@@ -0,0 +1,82 @@
+<?php
+
+namespace XuanChen\Sinopec\Action\sinopec;
+
+use XuanChen\Sinopec\Contracts\CheckCouponContracts;
+
+class ZhyQuery implements CheckCouponContracts
+{
+
+    public $data;
+
+    public function start()
+    {
+
+        try {
+            [
+                "cooperativeMerchant"  => "",
+                "eletronAndRule"       => [
+                    [
+                        "entryMethod"           => "01",
+                        "marketCode"            => "20191213154203514",
+                        "marketRuleNumber"      => "001",
+                        "perVoucherNumber"      => "1",
+                        "planVoucherNumber"     => "10",
+                        "queryCreateTime"       => "2019-11-11 18=> 39=> 49",
+                        "similarStack"          => "Y",
+                        "voucherEndTime"        => "2019-12-15",
+                        "voucher_ruleCode"      => "$01-VC-1573468710381900",
+                        "voucherRuleName"       => "ceshi2",
+                        "voucherSource"         => "S01",
+                        "voucherStartTime"      => "2019-12-13",
+                        "voucherStartTime_type" => "VOUCHER_START_TIME_TYPE_ABSOLUTE_EFFECTIVE_TIME",
+                    ],
+                ],
+                "limitFrequency"       => "",
+                "mabIsRefund"          => "",
+                "marketCode"           => "20191213154203514",
+                "marketExEndTime"      => "2019-12-15 00=> 00=> 00",
+                "marketExStartTime"    => "2019-12-13 00=> 00=> 00",
+                "marketHierarchy"      => "3311",
+                "marketName"           => "行为推送活动-3",
+                "marketProvince"       => "51",
+                "marketReleaseSys"     => "VOUCHER_PUBLISH_TYPE_APPLET",
+                "marketStatus"         => "MARKET_ACTIVITY_STATE_TAKE_EFFECT",
+                "promotionCalculation" => "PROMOTION_TYPE_MEMBER_BEHAVIOR",
+                "rule"                 => [
+                    [
+                        "cashValue"         => "100",
+                        "channel"           => "C01,C02,C03,C05",
+                        "fullType"          => "",
+                        "marketCode"        => "20191213154203514",
+                        "perVoucherNumber"  => "1",
+                        "planVoucherNumber" => "10",
+                        "ruleCode"          => "$01-VC-1573468710381900",
+                        "ruleDetail"        => "123123",
+                        "ruleName"          => "ceshi2",
+                        "voucherType"       => "C01",
+                    ],
+                ],
+                "tradLimit"            => [
+                    [
+                        "endValue"         => "",
+                        "fixed"            => "",
+                        "marketCode"       => "20191213154203514",
+                        "marketRuleName"   => "001",
+                        "marketRuleNumber" => "001",
+                        "memLevel"         => "",
+                        "operator"         => "",
+                        "startValue"       => "",
+                        "tradingUnit"      => "",
+                        "transactionType"  => "",
+                    ],
+                ],
+            ];
+
+        } catch (\Exception $e) {
+            return $e->getMessage();
+        }
+
+    }
+
+}

packages/sinopec/src/Contracts/CheckCouponContracts.php

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

packages/sinopec/src/Contracts/CouponContracts.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace XuanChen\Sinopec\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/sinopec/src/ServiceProvider.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace XuanChen\Sinopec;
+
+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/sinopec.php' => config_path('sinopec.php')]);
+        }
+    }
+
+    /**
+     * Bootstrap services.
+     * @return void
+     */
+    public function boot()
+    {
+        $this->mergeConfigFrom(__DIR__ . '/../config/sinopec.php', 'sinopec');
+
+    }
+
+}

packages/sinopec/src/Sinopec.php

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

packages/sinopec/src/Traits/Log.php

@@ -0,0 +1,47 @@
+<?php
+
+namespace XuanChen\Sinopec\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/sinopec/src/Traits/SetParams.php

@@ -0,0 +1,79 @@
+<?php
+
+namespace XuanChen\Sinopec\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;
+
+    }
+
+}

packages/unionpay/README.md

@@ -0,0 +1,11 @@
+# Unionpay 对接银联接口
+
+002025 聚合营销优惠查询接口
+
+002100 销账交易接口
+
+002101 销账冲正通知接口
+
+002102 销账撤销通知接口
+
+接口地址：http://pac.ysd-bs.com/api/V1/unionpay/query

packages/unionpay/composer.json

@@ -0,0 +1,27 @@
+{
+    "name": "xuanchen/unionpay",
+    "description": "银联对接",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "玄尘",
+            "email": "122383162@qq.com"
+        }
+    ],
+    "require": {
+        "php": ">=7.1.3",
+        "laravel/framework": "*"
+    },
+    "autoload": {
+        "psr-0": {
+            "XuanChen\\UnionPay": "src/"
+        }
+    },
+    "extra": {
+        "laravel": {
+            "providers": [
+                "XuanChen\\UnionPay\\ServiceProvider"
+            ]
+        }
+    }
+}

packages/unionpay/config/unionpay.php

@@ -0,0 +1,339 @@
+<?php
+
+return [
+    //分配的渠道号
+    'msg_sender'  => '660134',
+    //打印在小票上，由活动标题、优惠金额、原始金额组合而成
+    'pos_receipt' => '本时生活，优惠生活',
+    //广告，用于打印在小票上
+    'pos_ad'      => '',
+    //营销联盟广告，用于打印在小票上
+    'pos_mkt_ad'  => '本时生活，优惠生活',
+    //银联渠道id
+    'agent_id'    => '299',
+    //银联网点id
+    'outlet_id'   => '2009300919918',
+    //用于银商与sp分润的金额(是佣金的一部分), 以分为单位
+    'serv_chg'    => 0,
+    //佣金
+    'commission'  => 0,
+    //证书
+    'check'       => [
+        'self'     => [
+            'private' => storage_path('cert/unionpay/self/private_rsa.pem'),
+            'public'  => storage_path('cert/unionpay/self/public_rsa.pem'),
+        ],
+        'unionpay' => [
+            'public' => storage_path('cert/unionpay/public_rsa.pem'),
+        ],
+    ],
+    'type'        => [
+        '002025' => '查询',
+        '002100' => '交易',
+        '002101' => '冲正',
+        '002102' => '撤销',
+    ],
+    'log_type'    => [
+        '002025' => 'query',
+        '002100' => 'freezecoupon',
+        '002101' => 'reversal',
+        '002102' => 'annul',
+    ],
+    //需要校验的数据
+    'validator'   => [
+        '002025' => [
+            "msg_type",
+            "msg_txn_code",
+            "msg_crrltn_id",
+            "msg_flg",
+            "msg_sender",
+            "msg_time",
+            "msg_ver",
+            "msg_sys_sn",
+            "req_serial_no",
+            "mkt_code",
+            "amount",
+            "avl_amt",
+        ],
+        '002100' => [
+            "msg_type",
+            "msg_txn_code",
+            "msg_crrltn_id",
+            "msg_flg",
+            "msg_sender",
+            "msg_time",
+            "msg_sys_sn",
+            "msg_ver",
+            "req_serial_no",
+            "orig_req_serial_no",
+            "sett_date",
+            "txn_date",
+            "txn_time",
+            "orig_amt",
+            "discount_amt",
+        ],
+        '002101' => [
+            "msg_type",
+            "msg_txn_code",
+            "msg_crrltn_id",
+            "msg_flg",
+            "msg_sender",
+            "msg_time",
+            "msg_sys_sn",
+            "msg_ver",
+            "req_serial_no",
+            "orig_req_serial_no",
+        ],
+        '002102' => [
+            "msg_type",
+            "msg_txn_code",
+            "msg_crrltn_id",
+            "msg_flg",
+            "msg_sender",
+            "msg_time",
+            "msg_sys_sn",
+            "msg_ver",
+            "req_serial_no",
+            "orig_req_serial_no",
+        ],
+    ],
+    //入库基础数据
+    'regular'     => [
+        '002025' => [
+            "msg_type",
+            "msg_txn_code",
+            "msg_crrltn_id",
+            "msg_flg",
+            "msg_sender",
+            "msg_time",
+            "msg_ver",
+            "msg_sys_sn",//自己添加的基础数据
+            "req_serial_no",//自己添加的基础数据
+            "mkt_code",//自己添加的基础数据
+        ],
+        '002100' => [
+            "msg_type",
+            "msg_txn_code",
+            "msg_crrltn_id",
+            "msg_flg",
+            "msg_sender",
+            "msg_time",
+            "msg_sys_sn",
+            "msg_ver",
+            "req_serial_no",//自己添加的基础数据
+            "orig_req_serial_no",//自己添加的基础数据
+            "sett_date",//自己添加的基础数据
+        ],
+        '002101' => [
+            "msg_type",
+            "msg_txn_code",
+            "msg_crrltn_id",
+            "msg_flg",
+            "msg_sender",
+            "msg_time",
+            "msg_sys_sn",
+            "msg_ver",
+            "req_serial_no",//自己添加的基础数据
+            "orig_req_serial_no",//自己添加的基础数据
+        ],
+        '002102' => [
+            "msg_type",
+            "msg_txn_code",
+            "msg_crrltn_id",
+            "msg_flg",
+            "msg_sender",
+            "msg_time",
+            "msg_sys_sn",
+            "msg_ver",
+            "req_serial_no",//自己添加的基础数据
+            "orig_req_serial_no",//自己添加的基础数据
+        ],
+    ],
+    'fields'      => [
+        //聚合营销优惠查询接口
+        '002025' => [
+            'in'  => [
+                "msg_type"          => "报文类型",
+                "msg_txn_code"      => "交易代码",
+                "msg_crrltn_id"     => "报文流水号",
+                "msg_flg"           => "报文请求应答标志",
+                "msg_sender"        => "报文发送方",
+                "msg_time"          => "报文日期",
+                "msg_sys_sn"        => "平台流水号",
+                "msg_ver"           => "报文版本号",
+                "req_serial_no"     => "查询流水号",
+                "shop_no"           => "门店号",
+                "term_no"           => "受理终端号",
+                "service_code"      => "受理方式",
+                "voucher_no"        => "受理凭证号",
+                "mkt_code"          => "聚合营销码",
+                "mkt_mode"          => "聚合营销类型",
+                "embedded_mchnt_no" => "发起渠道商户号",
+                "currency_code"     => "货币代码",
+                "amount"            => "消费金额",
+                "avl_amt"           => "可优惠金额",
+                "term_sp_chnl_no"   => "终端指定SP渠道号",
+                "func_code"         => "功能码",
+                "times"             => "次数",
+                "pay_mode"          => "支付方式",
+                //用户附加信息
+                "user_ext_info"     => [
+                    "mobile_no"      => "手机号",
+                    "user_code"      => "用户号",
+                    "user_code_type" => "用户号类型",
+                    "dev_id"         => "设备id",
+                ],
+                "sign"              => "签名域",
+            ],
+            'out' => [
+                "msg_type"      => "报文类型",
+                "msg_txn_code"  => "交易代码",
+                "msg_crrltn_id" => "报文流水号",
+                "msg_flg"       => "报文请求应答标志",
+                "msg_sender"    => "报文发送方",
+                "msg_time"      => "报文日期",
+                "msg_sys_sn"    => "平台流水号",
+                "msg_rsp_code"  => "响应码",
+                "msg_rsp_desc"  => "响应码描述",
+                "discount"      => "折扣金额",
+                "actual_amt"    => "折后应收金额",
+                "pos_display"   => "POS显示",
+                "pos_receipt"   => "POS小票",
+                "pos_ad"        => "POS广告",
+                "pos_mkt_ad"    => "Pos_营销联盟广告",
+                "sign"          => "签名域",
+            ],
+        ],
+        //销账交易接口
+        '002100' => [
+            'in'  => [
+                "msg_type"           => "报文类型",
+                "msg_txn_code"       => "交易代码",
+                "msg_crrltn_id"      => "消息关联号",
+                "msg_flg"            => "报文请求应答标志",
+                "msg_sender"         => "报文发送方",
+                "msg_time"           => "报文日期",
+                "msg_sys_sn"         => "平台流水号",
+                "msg_ver"            => "报文版本号",
+                "shop_no"            => "门店号",
+                "term_no"            => "终端号",
+                "req_serial_no"      => "销券流水号",
+                "orig_req_serial_no" => "原查询流水号",
+                "enc_card_no"        => "加密卡号",
+                "part_card_no"       => "部分卡号",
+                "acq_term_sn"        => "受理终端流水号",
+                "refer_no"           => "检索参考号",
+                "sett_date"          => "清算日期",
+                "txn_date"           => "交易日期",
+                "txn_time"           => "交易时间",
+                "orig_amt"           => "原始金额",
+                "discount_amt"       => "优惠的金额",
+                "pay_amt"            => "支付金额",
+                "pay_mode"           => "支付方式",
+                "order_no"           => "订单号",
+                "trans_crrltn_no"    => "交易关联流水号",
+                "equity_no"          => "权益号",
+                "card_no"            => "全卡号",
+                "sign"               => "签名数据",
+            ],
+            'out' => [
+                "msg_type"        => "报文类型",
+                "msg_txn_code"    => "交易代码",
+                "msg_crrltn_id"   => "消息关联号",
+                "msg_flg"         => "报文请求应答标志",
+                "msg_sender"      => "报文发送方",
+                "msg_time"        => "报文日期",
+                "msg_sys_sn"      => "平台流水号",
+                "msg_ver"         => "报文版本号",
+                "msg_rsp_code"    => "响应码",
+                "msg_rsp_desc"    => "响应码描述",
+                "orig_amt"        => "原始金额",
+                "discount_amt"    => "折扣金额",
+                "pay_amt"         => "支付金额",
+                "serv_chg"        => "服务费",
+                "commission"      => "佣金",
+                "ad"              => "广告",
+                "pos_receipt"     => "POS优惠",
+                "coupon_no"       => "凭证号",
+                "coupon_type"     => "凭证类型",
+                "sp_biz_code"     => "SP统计码",
+                "charge_code"     => "计费码",
+                "pos_event_title" => "SP活动主题",
+                "sp_contact"      => "SP联系电话",
+                "sp_name"         => "SP名称",
+                "event_no"        => "活动号",
+                "td_code"         => "二维码",
+                "memo"            => "附言",
+                "mkt_sp_chnl_no"  => "营销渠道号",
+                "point_amt"       => "积分抵扣金额",
+                "sign"            => "签名数据",
+            ],
+        ],
+        //销账冲正通知接口
+        '002101' => [
+            'in'  => [
+                "msg_type"           => "报文类型",
+                "msg_txn_code"       => "交易代码",
+                "msg_crrltn_id"      => "消息关联号",
+                "msg_flg"            => "报文请求应答标志",
+                "msg_sender"         => "报文发送方",
+                "msg_time"           => "报文日期",
+                "msg_sys_sn"         => "平台流水号",
+                "msg_ver"            => "报文版本号",
+                "shop_no"            => "门店号",
+                "term_no"            => "终端号",
+                "req_serial_no"      => "冲正流水号",
+                "orig_req_serial_no" => "原始销账流水号",
+                "trans_crrltn_no"    => "交易关联流水号",
+                "sign"               => "签名数据",
+            ],
+            'out' => [
+                "msg_type"      => "报文类型",
+                "msg_txn_code"  => "交易代码",
+                "msg_crrltn_id" => "消息关联号",
+                "msg_flg"       => "报文请求应答标志",
+                "msg_sender"    => "报文发送方",
+                "msg_time"      => "报文日期",
+                "msg_sys_sn"    => "平台流水号",
+                "msg_ver"       => "报文版本号",
+                "msg_rsp_code"  => "响应码",
+                "msg_rsp_desc"  => "响应码描述",
+                "sign"          => "签名数据",
+            ],
+        ],
+        '002102' => [
+            'in'  => [
+                "msg_type"           => "报文类型",
+                "msg_txn_code"       => "交易代码",
+                "msg_crrltn_id"      => "消息关联号",
+                "msg_flg"            => "报文请求应答标志",
+                "msg_sender"         => "报文发送方",
+                "msg_time"           => "报文日期",
+                "msg_sys_sn"         => "平台流水号",
+                "msg_ver"            => "报文版本号",
+                "shop_no"            => "门店号",
+                "term_no"            => "终端号",
+                "req_serial_no"      => "撤销流水号",
+                "orig_req_serial_no" => "原始销账流水号",
+                "trans_crrltn_no"    => "交易关联流水号",
+                "sign"               => "签名数据",
+            ],
+            'out' => [
+                "msg_type"      => "报文类型",
+                "msg_txn_code"  => "交易代码",
+                "msg_crrltn_id" => "消息关联号",
+                "msg_flg"       => "报文请求应答标志",
+                "msg_sender"    => "报文发送方",
+                "msg_time"      => "报文日期",
+                "msg_sys_sn"    => "平台流水号",
+                "msg_ver"       => "报文版本号",
+                "msg_rsp_code"  => "响应码",
+                "msg_rsp_desc"  => "响应码描述",
+                "ad"            => "广告",
+                "td_code"       => "二维码",
+                "sign"          => "签名数据",
+            ],
+        ],
+
+    ],
+];

packages/unionpay/src/Action/Init.php

@@ -0,0 +1,243 @@
+<?php
+
+namespace XuanChen\UnionPay\Action;
+
+use App\Exceptions\ApiException;
+use App\Exceptions\ApiUnionpayException;
+use App\Models\Log as LogModel;
+use Illuminate\Http\Request;
+
+class Init
+{
+
+    //传入的参数
+    public $params;
+
+    //传入的签名
+    public $sign;
+
+    public $msg_type     = '00';
+
+    public $msg_txn_code;
+
+    public $msg_sender;
+
+    public $msg_rsp_code = '0000';
+
+    public $msg_rsp_desc = '成功';
+
+    //入库的模型
+    public $model;
+
+    //返回的数据
+    public $outdata;
+
+    //网点id
+    public $outlet_id;
+
+    //渠道id
+    public $agent_id;
+
+    //日志
+    public $log;
+
+    //幂等数据
+    public $info;
+
+    //内存
+    public $mem;
+
+    //开始内存
+    public $startMemory;
+
+    /**
+     * Notes: 验签
+     * @Author: 玄尘
+     * @Date  : 2020/9/30 8:39
+     * @param false $self 是否是自己的证书
+     * @return bool|string
+     */
+    public function checkSign($out = true, $self = false)
+    {
+        $sign = $this->hexXbin($this->sign);
+        if (!$sign) {
+            throw new \Exception('签名错误');
+        }
+        $public_key = $this->getPublic($self);
+
+        $pub_key_id = openssl_get_publickey($public_key);
+
+        $signStr = $this->getSignString($out);
+
+        if ($pub_key_id) {
+            $result = (bool)openssl_verify($signStr, $sign, $pub_key_id);
+            openssl_free_key($pub_key_id);
+        } else {
+            throw new \Exception('私钥格式有误');
+
+        }
+
+        return $result;
+    }
+
+    /**
+     * Notes: 校验sign
+     * @Author: 玄尘
+     * @Date  : 2020/10/13 15:21
+     * @param       $data
+     * @param false $types
+     * @return int|string
+     */
+    public function hexXbin($sign, $types = false)
+    {
+        // 过滤非16进制字符
+        $checkStr = strspn($sign, '0123456789abcdefABCDEF');
+        //字符串长度不是偶数时pack来处理
+        if (strlen($checkStr) % 2) {
+            return pack("H*", $sign);
+        } else {
+            return hex2bin($sign);
+        }
+    }
+
+    /**
+     * Notes: 签名
+     * @Author: 玄尘
+     * @Date  : 2020/10/9 15:52
+     * @param bool $self
+     * @return string
+     * @throws \Exception
+     */
+    public function getSign($out = true)
+    {
+        $signStr     = $this->getSignString($out);
+        $private_key = $this->getPrivate();
+
+        $privKeyId = openssl_pkey_get_private($private_key);
+        if (!$privKeyId) {
+            throw new \Exception('私钥格式有误');
+        }
+
+        if (openssl_sign($signStr, $signature, $privKeyId)) {
+            $signature = bin2hex($signature);
+        } else {
+            throw new \Exception('签名错误');
+        }
+
+        openssl_free_key($privKeyId);
+
+        return $signature;
+    }
+
+    /**
+     * Notes: 获取待签名字符串
+     * @Author: 玄尘
+     * @Date  : 2020/9/30 9:38
+     * @param $out 是否是获取返回值的数据
+     * @return string
+     */
+    public function getSignString($out = false)
+    {
+        if ($out) {
+            $params = array_filter($this->outdata);
+        } else {
+            $params = array_filter($this->params);
+        }
+
+        if (empty($params)) {
+            throw new \Exception('缺少数据');
+        }
+
+        ksort($params);
+
+        //http_build_query 会自动urlencode 需要转换
+        return $this->str2utf8(urldecode(http_build_query($params)));
+
+    }
+
+    //获取私钥
+    public function getPrivate()
+    {
+        $private = config('unionpay.check.self.private');
+
+        if (!file_exists($private)) {
+            throw new \Exception('缺少私钥文件');
+        }
+
+        return file_get_contents($private);
+    }
+
+    //获取公钥
+    public function getPublic($self = false)
+    {
+        $public = config('unionpay.check.unionpay.public');
+
+        if ($self) {
+            $public = config('unionpay.check.self.public');
+        }
+
+        return file_get_contents($public);
+    }
+
+    /**
+     * Notes: 插入日志
+     * @Author: 玄尘
+     * @Date  : 2020/10/9 14:38
+     * @return mixed
+     */
+    public function addLog()
+    {
+        $log_type = config('unionpay.log_type');
+        $data     = [
+            'path'      => request()->url(),
+            'method'    => request()->method(),
+            'type'      => $log_type[$this->msg_txn_code] ?? $this->msg_txn_code,
+            'in_source' => $this->params,
+        ];
+
+        return $this->log = LogModel::create($data);
+    }
+
+    /**
+     * Notes: 更新日志
+     * @Author: 玄尘
+     * @Date  : 2020/10/9 14:46
+     */
+    public function updateLog()
+    {
+        $this->log->out_source = $this->outdata;
+        $this->log->save();
+    }
+
+    /**
+     * 将字符串编码转为 utf8
+     * @param $str
+     * @return string
+     */
+    public function str2utf8($str)
+    {
+        $encode = mb_detect_encoding($str, ['ASCII', 'UTF-8', 'GB2312', 'GBK', 'BIG5']);
+        if ($encode != 'UTF-8') {
+            $str = $str ? $str : mb_convert_encoding($str, 'UTF-8', $encode);
+        }
+        $str = is_string($str) ? $str : '';
+
+        return $str;
+    }
+
+    //输出数据
+    public function respond()
+    {
+        $rt = microtime(true) - LARAVEL_START;
+
+        $header = [
+            'rt'          => round($rt * 1000, 2) . 'ms',
+            'qps'         => round(1 / $rt, 1), 'company' => 'YSD',
+            'startMemory' => $this->startMemory,
+            'endMemory'   => round(memory_get_usage() / 1024 / 1024, 2),
+        ];
+
+        return \Response::json($this->outdata, 200, $header);
+    }
+
+}

packages/unionpay/src/Action/Query.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace XuanChen\UnionPay\Action;
+
+use XuanChen\Coupon\Coupon;
+use XuanChen\UnionPay\Contracts\Contracts;
+use XuanChen\UnionPay\UnionPay;
+
+/**
+ * Class  查询
+ * @Author  : 玄尘
+ * @Date    : 2020/10/28 16:17
+ * @package XuanChen\UnionPay\Action
+ */
+class Query implements Contracts
+{
+
+    /**
+     * Parent unionpay.
+     * @var UnionPay
+     */
+    protected $unionpay;
+
+    public function __construct(UnionPay &$unionpay)
+    {
+        $this->unionpay = $unionpay;
+    }
+
+    public function start()
+    {
+        try {
+            $res = Coupon::Query($this->unionpay->params['mkt_code'], $this->unionpay->outlet_id);
+
+            if (is_array($res)) {
+                $this->unionpay->outdata['pos_display'] = $res['name'];
+                $this->unionpay->outdata['discount']    = $res['price'] * 100;
+                $this->unionpay->outdata['actual_amt']  = (int)bcsub($this->unionpay->params['amount'], $res['price'] * 100);
+            } else {
+                $this->unionpay->outdata['msg_rsp_code'] = '9999';
+                $this->unionpay->outdata['msg_rsp_desc'] = $res;
+            }
+        } catch (\Exception $e) {
+            $this->unionpay->outdata['msg_rsp_code'] = '9999';
+            $this->unionpay->outdata['msg_rsp_desc'] = $e->getMessage();
+        }
+
+    }
+
+    public function back()
+    {
+        return $this->unionpay->outdata;
+    }
+
+}

packages/unionpay/src/Action/Redemption.php

@@ -0,0 +1,65 @@
+<?php
+
+namespace XuanChen\UnionPay\Action;
+
+use App\Models\ActivityCoupon;
+use App\Models\UnionpayLog;
+use App\Models\User;
+use XuanChen\Coupon\Coupon;
+use XuanChen\UnionPay\Contracts\Contracts;
+use XuanChen\UnionPay\UnionPay;
+
+/**
+ * Class Redemption  核销
+ * @Author  : 玄尘
+ * @Date    : 2020/10/28 16:17
+ * @package XuanChen\UnionPay\Action
+ */
+class Redemption implements Contracts
+{
+
+    /**
+     * Parent unionpay.
+     * @var UnionPay
+     */
+    protected $unionpay;
+
+    public function __construct(UnionPay &$unionpay)
+    {
+        $this->unionpay = $unionpay;
+    }
+
+    public function start()
+    {
+        //查询聚合信息
+        $query = UnionpayLog::where('req_serial_no', $this->unionpay->params['orig_req_serial_no'])
+                            ->where('msg_txn_code', '002025')
+                            ->latest()
+                            ->first();
+        if (!$query) {
+            $this->unionpay->outdata['msg_rsp_code'] = '9999';
+            $this->unionpay->outdata['msg_rsp_desc'] = '销账失败，未查询到前置数据。';
+        } else {
+            $this->unionpay->outdata['orig_amt']     = (int)$query->in_source['amount'];              //订单金额 原始金额
+            $this->unionpay->outdata['discount_amt'] = $query->out_source['discount'];                //折扣金额
+            $this->unionpay->outdata['pay_amt']      = $query->out_source['actual_amt'];              //折扣后金额
+
+            //获取银联渠道
+            $user = User::find($this->unionpay->agent_id);
+
+            $coupon = Coupon::Redemption($user, $query->mkt_code, $this->unionpay->params['orig_amt'] / 100, $this->unionpay->outlet_id, '');
+            if (!is_array($coupon)) {
+                $this->unionpay->outdata['msg_rsp_code'] = '9999';
+                $this->unionpay->outdata['msg_rsp_desc'] = $coupon;
+            }
+
+        }
+
+    }
+
+    public function back()
+    {
+        return $this->unionpay->outdata;
+    }
+
+}

packages/unionpay/src/Action/Reversal.php

@@ -0,0 +1,80 @@
+<?php
+
+namespace XuanChen\UnionPay\Action;
+
+use App\Models\UnionpayLog;
+use XuanChen\Coupon\Coupon;
+use App\Models\Coupon as CouponModel;
+use XuanChen\UnionPay\Contracts\Contracts;
+use XuanChen\UnionPay\UnionPay;
+
+class Reversal implements Contracts
+{
+
+    /**
+     * Parent unionpay.
+     * @var UnionPay
+     */
+    protected $unionpay;
+
+    public function __construct(UnionPay &$unionpay)
+    {
+        $this->unionpay = $unionpay;
+    }
+
+    public function start()
+    {
+        try {
+            //查询聚合信息
+            $info = UnionpayLog::where('req_serial_no', $this->unionpay->params['orig_req_serial_no'])
+                               ->where('msg_txn_code', '002100')
+                               ->where('status', 1)
+                               ->latest()
+                               ->first();
+
+            if ($info) {
+                $query = UnionpayLog::where('req_serial_no', $info->orig_req_serial_no)
+                                    ->where('msg_txn_code', '002025')
+                                    ->where('status', 1)
+                                    ->latest()
+                                    ->first();
+
+                $coupon = CouponModel::where('redemptionCode', $query->mkt_code)
+                                     ->where('status', 2)
+                                     ->latest()
+                                     ->first();
+
+                if ($query && $coupon) {
+                    //优惠券核销成功
+                    if ($coupon->status == 2) {
+                        $res = Coupon::Reversal($coupon->redemptionCode, $this->unionpay->outlet_id);
+                        if ($res !== true) {
+                            $this->unionpay->outdata['msg_rsp_code'] = '9999';
+                            $this->unionpay->outdata['msg_rsp_desc'] = $res;
+                        }
+                    } else {
+                        $this->unionpay->outdata['msg_rsp_code'] = '9999';
+                        $this->unionpay->outdata['msg_rsp_desc'] = '优惠券状态不对';
+                    }
+                } else {
+                    $this->unionpay->outdata['msg_rsp_code'] = '9999';
+                    $this->unionpay->outdata['msg_rsp_desc'] = '未查询到卡券信息。';
+                }
+
+            } else {
+                $this->unionpay->outdata['msg_rsp_code'] = '9999';
+                $this->unionpay->outdata['msg_rsp_desc'] = '未查询到销账接口数据。';
+            }
+        } catch (\Exception $e) {
+            $this->unionpay->outdata['msg_rsp_code'] = '9999';
+            $this->unionpay->outdata['msg_rsp_desc'] = $e->getMessage();
+        }
+
+    }
+
+    public function back()
+    {
+        return $this->unionpay->outdata;
+    }
+
+}

packages/unionpay/src/Contracts/Contracts.php

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

packages/unionpay/src/ServiceProvider.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace XuanChen\UnionPay;
+
+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/unionpay.php' => config_path('unionpay.php')]);
+        }
+    }
+
+    /**
+     * Bootstrap services.
+     * @return void
+     */
+    public function boot()
+    {
+        $this->mergeConfigFrom(__DIR__ . '/../config/unionpay.php', 'unionpay');
+
+    }
+
+}

packages/unionpay/src/UnionPay.php

@@ -0,0 +1,256 @@
+<?php
+
+namespace XuanChen\UnionPay;
+
+use App\Models\UnionpayLog;
+use App\Models\User;
+use XuanChen\UnionPay\Action\Init;
+use XuanChen\Coupon\Coupon;
+use XuanChen\UnionPay\Action\Query;
+use XuanChen\UnionPay\Action\Redemption;
+use XuanChen\UnionPay\Action\Reversal;
+use XuanChen\UnionPay\Action\Skyxu;
+
+/**
+ * 银联入口
+ */
+class UnionPay extends Init
+{
+
+    /**
+     * UnionPay constructor.
+     * @param        $params
+     * @param string $sign
+     */
+    public function __construct($params, $sign = '')
+    {
+        $this->params       = $params;
+        $this->sign         = $sign;
+        $this->msg_txn_code = $params['msg_txn_code'] ?? '';
+        $this->msg_sender   = config('unionpay.msg_sender');
+        $this->agent_id     = config('unionpay.agent_id');
+        $this->outlet_id    = config('unionpay.outlet_id');
+        $this->startMemory  = round(memory_get_usage() / 1024 / 1024, 2);
+
+    }
+
+    /**
+     * Notes: 入口
+     * @Author: 玄尘
+     * @Date  : 2020/10/9 9:33
+     */
+    public function start()
+    {
+        //设置基础数据
+        $this->getOutBaseData();
+
+        try {
+            //校验数据
+            $this->checkInData();
+            //查询是否是幂等 就是重复查询
+            $this->idempotent();
+            //入库请求参数
+            $this->InputData();
+            //返回值
+            $this->out_data();
+            //更新数据
+            $this->updateOutData();
+        } catch (\Exception $e) {
+
+            $this->outdata['msg_rsp_code'] = '9999';
+            $this->outdata['msg_rsp_desc'] = $e->getMessage();
+            if (empty($this->model->out_source)) {
+                $this->updateOutData();
+            }
+        }
+
+    }
+
+    //处理流程
+    public function out_data()
+    {
+        //是幂等
+        if ($this->info && !empty($this->info->out_source)) {
+            $this->outdata = $this->info->out_source;
+        } else {
+            if ($this->msg_rsp_code == '0000') {
+                switch ($this->msg_txn_code) {
+                    case '002025'://聚合营销优惠查询接口
+                        $action = new Query($this);
+                        $action->start();
+                        break;
+                    case '002100'://销账交易接口
+                        $action = new Redemption($this);
+                        $action->start();
+                        $this->outdata = $action->back();
+                        break;
+                    case '002101'://冲正
+                    case '002102'://撤销
+                        $action = new Reversal($this);
+                        $action->start();
+                        $this->outdata = $action->back();
+                        break;
+                    default:
+                        break;
+                }
+
+            } else {
+                $this->outdata['msg_rsp_code'] = $this->msg_rsp_code;
+                $this->outdata['msg_rsp_desc'] = $this->msg_rsp_desc;
+            }
+        }
+
+    }
+
+    /**
+     * Notes: 入库数据
+     * @Author: 玄尘
+     * @Date  : 2020/9/30 8:46
+     */
+    private function InputData()
+    {
+        //获取基础数据
+        $base = config('unionpay.regular')[$this->msg_txn_code];
+        $data = [];
+        //循环获取入库数据
+        foreach ($this->params as $key => $param) {
+            if (in_array($key, $base)) {
+                $data[$key] = $param;
+            } else {
+                $data['in_source'][$key] = $param;
+            }
+        }
+        $this->model = UnionpayLog::create($data);
+
+        if (empty($this->model)) {
+            throw new \Exception('数据入库失败');
+        }
+    }
+
+    /**
+     * Notes: 校验输入的数据
+     * @Author: 玄尘
+     * @Date  : 2020/9/30 14:46
+     */
+    public function checkInData()
+    {
+        //验签
+        //        $res = $this->checkSign(false, false);
+        //
+        //        if ($res !== true) {
+        //            $this->msg_rsp_code = 9996;
+        //            $this->msg_rsp_desc = '验签失败';
+        //        }
+
+        if ($this->msg_txn_code && $this->msg_rsp_code == '0000') {
+            $rule_code = config('unionpay.validator')[$this->msg_txn_code];
+            $rule_msg  = config('unionpay.fields')[$this->msg_txn_code]['in'];
+
+            foreach ($rule_code as $item) {
+                $rule[$item]              = 'required';
+                $msg[$item . '.required'] = $rule_msg[$item] . '不能为空';
+            }
+            $validator = \Validator::make($this->params, $rule, $msg);
+
+            if ($validator->fails()) {
+                $this->msg_rsp_code = 9996;
+                $this->msg_rsp_desc = $validator->errors()->first();
+
+            }
+
+        } else {
+
+            $this->msg_rsp_code = 9996;
+            $this->msg_rsp_desc = $this->msg_rsp_code == '0000' ? '平台流水号不能为空。' : $this->msg_rsp_desc;
+        }
+
+    }
+
+    /**
+     * Notes: 返回的基础数据
+     * @Author: 玄尘
+     * @Date  : 2020/9/30 14:48
+     */
+    public function getOutBaseData()
+    {
+        $basics = [
+            "msg_type"      => $this->msg_type,
+            "msg_txn_code"  => $this->msg_txn_code,
+            "msg_crrltn_id" => $this->params['msg_crrltn_id'],
+            "msg_flg"       => 1,
+            "msg_sender"    => $this->msg_sender,
+            "msg_time"      => now()->format('YmdHis'),
+            "msg_sys_sn"    => $this->params['msg_sys_sn'] ?? '',
+            "msg_rsp_code"  => $this->msg_rsp_code,
+            "msg_rsp_desc"  => $this->msg_rsp_desc,
+        ];
+
+        switch ($this->msg_txn_code) {
+            //查询
+            case '002025':
+                $basics = array_merge($basics, [
+                    "discount"    => 0,
+                    "actual_amt"  => 0,
+                    "pos_display" => "",
+                    //                    "pos_receipt" => config('unionpay.pos_receipt'),
+                    //                    "pos_ad"      => config('unionpay.pos_ad'),
+                    "pos_mkt_ad"  => config('unionpay.pos_receipt'),
+                ]);
+                break;
+            //销账
+            case '002100':
+                $basics = array_merge($basics, [
+                    'msg_ver'      => 0.1,
+                    'orig_amt'     => $this->params['orig_amt'],
+                    'discount_amt' => $this->params['discount_amt'],
+                    'pay_amt'      => $this->params['pay_amt'],
+                    'serv_chg'     => config('unionpay.serv_chg'),
+                    'commission'   => config('unionpay.commission'),
+                    'event_no'     => '',//活动号 直接为空就可以
+                ]);
+                break;
+            //冲正
+            case '002101':
+                //撤销
+            case '002102':
+                $basics = array_merge($basics, [
+                    'msg_ver' => 0.1,
+                ]);
+                break;
+            default:
+                break;
+        }
+
+        return $this->outdata = $basics;
+
+    }
+
+    /**
+     * Notes: 查询是否是幂等
+     * @Author: 玄尘
+     * @Date  : 2020/10/10 13:25
+     */
+    public function idempotent()
+    {
+        $this->info = UnionpayLog::where('req_serial_no', $this->params['req_serial_no'])
+                                 ->where('msg_txn_code', $this->msg_txn_code)
+                                 ->where('status', 1)
+                                 ->latest()
+                                 ->first();
+    }
+
+    //更新返回值
+    public function updateOutData()
+    {
+        $this->outdata['sign'] = $this->getSign();
+        //如果有入库模型
+        if ($this->model) {
+            $this->model->out_source = $this->outdata;
+            if ($this->outdata['msg_rsp_code'] != '0000') {
+                $this->model->status = 0;
+            }
+            $this->model->save();
+        }
+    }
+
+}

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**/ ?>