diff --git a/app/Admin/Controllers/Log/IndexController.php b/app/Admin/Controllers/Log/IndexController.php
index 41cbef0..7432473 100644
--- a/app/Admin/Controllers/Log/IndexController.php
+++ b/app/Admin/Controllers/Log/IndexController.php
@@ -10,18 +10,17 @@ use Encore\Admin\Widgets\Table;
 class IndexController extends AdminController
 {
 
-    protected $title = 'api 日志';
+    protected $title = 'api 日志22';
 
     /**
      * Notes:
      * @Author: <C.Jason>
-     * @Date  : 2019/9/18 14:50
+     * @Date: 2019/9/18 14:50
      * @return Grid
      */
     protected function grid()
     {
         $grid = new Grid(new Log);
-
         $grid->model()->orderBy('id', 'desc');
 
         $grid->disableActions();
@@ -32,10 +31,22 @@ class IndexController extends AdminController
                 'self'   => '自己',
             ]);
             $filter->where(function ($query) {
-                $query->where("in_source->query->redemptionCode", $this->input);
+                $query->where("out_source->data->profitOfferItemVersion", $this->input);
+            }, '券类型')->select([
+                1 => '新版',
+                0 => '老版',
+            ]);
+            $filter->where(function ($query) {
+                $query->where("in_source->query->redemptionCode", $this->input)
+                      ->orWhere("in_source->jiemi->redemptionCode", $this->input);
             }, '券码');
+            $filter->where(function ($query) {
+                $query->Where("in_source->jiemi->outletId", $this->input);
+            }, '网点编号');
 
             $filter->between('created_at', '提交时间')->datetime();
+
+            // $filter->equal('created_at', '提交时间')->date();
         });
 
         $grid->column('id', '#ID#');
@@ -59,7 +70,6 @@ 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', '返回信息');
@@ -73,8 +83,9 @@ class IndexController extends AdminController
             unset($out_source['merchantCert']);
             unset($out_source['serverCert']);
             unset($out_source['serverSign']);
-
-            //            unset($out_source['data']);
+            if (isset($out_source['data']) && is_string($out_source['data'])) {
+                unset($out_source['data']);
+            }
             return $out_source;
         });
         $grid->column('created_at', '提交时间');
diff --git a/app/Http/Controllers/TestController.php b/app/Http/Controllers/TestController.php
index 6a836b9..cef5fea 100644
--- a/app/Http/Controllers/TestController.php
+++ b/app/Http/Controllers/TestController.php
@@ -18,9 +18,11 @@ class TestController
 
     public function index(Request $request)
     {
+        $user_id = $request->user_id;
+        $data = $request->data;
         $this->user = User::find(3);
 
-        $data = 'Q7dhxBxcPnSGbnhDtHGgTNPYJfcRf0IcpOBSr+jjRF5SfLe0RLoiAMXYynZ9bb/dnon8MMw/o/AgO/yIIfhxo45Ya9yXOAEAogwR6Ti9nnM=';
+        $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) {