Merge branch 'master' into 1.1

app/Admin/Controllers/Activity/LogController.php

@@ -0,0 +1,94 @@
+<?php
+
+namespace App\Admin\Controllers\Activity;
+
+use App\Admin\Renderable\Activity\Grants;
+use App\Models\Activity;
+use App\Models\ActivityCouponLog;
+use App\Models\ActivityGrant;
+use App\Models\ActivityRule;
+use App\Models\User;
+use Encore\Admin\Controllers\HasResourceActions;
+use Encore\Admin\Form;
+use Encore\Admin\Grid;
+use Encore\Admin\Layout\Content;
+use Illuminate\Support\MessageBag;
+use Illuminate\Routing\Controller as AdminController;
+
+class LogController extends AdminController
+{
+
+    use HasResourceActions;
+
+    protected $title = '回调记录';
+
+    /**
+     * Get content title.
+     * @return string
+     */
+    protected function title()
+    {
+        return $this->title;
+    }
+
+    /**
+     * Index interface.
+     * @param Content $content
+     * @return Content
+     */
+    public function index(Content $content)
+    {
+        return $content
+            ->title($this->title())
+            ->description($this->description['index'] ?? trans('admin.list'))
+            ->body($this->grid());
+    }
+
+    protected function grid()
+    {
+        $grid = new Grid(new ActivityCouponLog);
+
+        $grid->model()->latest();
+        $grid->disableActions();
+        $grid->disableCreateButton();
+
+        $grid->filter(function ($filter) {
+            $filter->column(1 / 2, function ($filter) {
+                $filter->equal('code', '卡券编号');
+                $filter->equal('type', '分类')->select(ActivityCouponLog::TYPES);
+            });
+
+            $filter->column(1 / 2, function ($filter) {
+                $filter->equal('status', '状态')->select(ActivityCouponLog::STATUS);
+
+                $filter->between('created_at', '开始时间')->datetime();
+            });
+
+        });
+
+        $grid->column('id', '#ID#');
+        $grid->column('code', '卡券编号');
+        $grid->column('type', '分类')
+             ->using(ActivityCouponLog::TYPES)
+             ->label([
+                 1 => 'default',
+                 2 => 'warning',
+                 3 => 'info',
+             ]);
+
+        $grid->column('status', '状态')
+             ->using(ActivityCouponLog::STATUS)
+             ->label([
+                 1 => 'default',
+                 2 => 'warning',
+                 3 => 'info',
+             ]);
+
+        $grid->column('remark', '处理结果');
+
+        $grid->column('created_at', '操作时间');
+
+        return $grid;
+    }
+
+}

app/Admin/routes.php

@@ -53,5 +53,6 @@ Route::group([
     $router->resource('activities', 'Activity\IndexController');
     $router->resource('rules', 'Activity\RuleController');
     $router->resource('activitycoupons', 'Activity\CouponController');
+    $router->resource('activitycouponlogs', 'Activity\LogController');
 
 });

app/Http/Controllers/TestController.php

@@ -20,23 +20,36 @@ class TestController
 
     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;
 
-        $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';
+        return $this->success($ret);
-        $iv   = substr($this->user->des3key, 0, 8);
-        $ret  = openssl_decrypt($data, 'DES-EDE3-CBC', $this->user->des3key, 0, $iv);
-        if (false === $ret) {
-            return openssl_error_string();
-        }
-        dd($ret);
         dd();
-        $this->user = User::find(215);
+        $this->user = User::find(4);
         $ret        = [
             'redemptionCode' => '951951858070',
             'total'          => 5,
-            'outletId'       => '2006151433887',
+            'outletId'       => '2008241014458',
         ];
 
         return $this->success($ret);

app/Merchant/Controllers/Coupon/IndexController.php

@@ -3,7 +3,6 @@
 namespace App\Merchant\Controllers\Coupon;
 
 use App\Merchant\Controllers\Controller;
-use App\Merchant\Exporters\CouponExport;
 use App\Models\ActivityRule;
 use App\Models\Coupon;
 use Auth;
@@ -245,7 +244,7 @@ class IndexController extends Controller
         if (!$request->end) {
             $request->end = now()->toDateTimeString();
         }
-        set_time_limit(1200);
+        set_time_limit(0);
         ini_set('memory_limit', '1024M');
         $filename = '卡券记录' . date('YmdHis') . '.csv';
         $response = function () use ($user, $request) {

app/Models/ActivityCouponLog.php

@@ -9,4 +9,18 @@ class ActivityCouponLog extends Model
         'source' => 'array',
     ];
 
+    const TYPE_DESTROY      = 'Destroy';
+    const TYPE_VERIFICATION = 'Verification';
+    const TYPES             = [
+        self::TYPE_DESTROY      => '作废',
+        self::TYPE_VERIFICATION => '核销',
+    ];
+
+    const STATUS_SUCCESS = 1;
+    const STATUS_ERROR   = 0;
+    const STATUS         = [
+        self::STATUS_SUCCESS => '成功',
+        self::STATUS_ERROR   => '失败',
+    ];
+
 }