Merge branch 'zjl_self_jd_20180917' into development

app/Http/Controllers/OrderController.php

@@ -352,6 +352,11 @@ Class OrderController extends Controller
     {
         $info = $this->getOrderInfo($request, 1);
 
+        // 若为京东自营角色，则跳转到自营列表
+        if ($info['role'] == 6) {
+            return redirect('self_order');
+        }
+
         return view('orderlist', $info);
     }