Merge branch 'master' of http://119.23.72.7/zhujilai/Order into zjl_adjust_20180911

app/Http/Controllers/OrderController.php

@@ -352,6 +352,11 @@ Class OrderController extends Controller
     {
     {
         $info = $this->getOrderInfo($request, 1);
         $info = $this->getOrderInfo($request, 1);
 
 
+        // 若为京东自营角色，则跳转到自营列表
+        if ($info['role'] == 6) {
+            return redirect('self_order');
+        }
+
         return view('orderlist', $info);
         return view('orderlist', $info);
     }
     }
 
 
@@ -390,6 +395,10 @@ Class OrderController extends Controller
             $data['sale_id'] = $request->user->userId;
             $data['sale_id'] = $request->user->userId;
         }
         }
 
 
+        if ($tid == 2 && $info['role'] == 6) {
+            $map['check_jd_order'] = 1; // 只允许查看京东自营订单
+        }
+
         // 非竞调账号显示真实数据
         // 非竞调账号显示真实数据
         if ($info['username'] != 'vpadmin@ichunt.com') {
         if ($info['username'] != 'vpadmin@ichunt.com') {
             $map['is_fake'] = 0;
             $map['is_fake'] = 0;

app/Http/Controllers/PermController.php

@@ -53,6 +53,8 @@
 							return 4;
 							return 4;
 						} else if ($department->name == '测试') {
 						} else if ($department->name == '测试') {
 							return 5;
 							return 5;
+						} else if ($department->name == '京东自营') {
+							return 6;
 						} else {
 						} else {
 							return 0;
 							return 0;
 						}
 						}

resources/views/selfOrder/content.blade.php

@@ -60,6 +60,8 @@
                                         </div>
                                         </div>
                                     </dd>
                                     </dd>
                                 </dl>
                                 </dl>
+                                <!-- 京东自营角色不显示订单来源 -->
+                                @if ($role != 6)
                                 <dl>
                                 <dl>
                                     <dt>订单来源：</dt>
                                     <dt>订单来源：</dt>
                                     <dd style="width: 115px;">
                                     <dd style="width: 115px;">
@@ -74,6 +76,7 @@
                                         </div>
                                         </div>
                                     </dd>
                                     </dd>
                                 </dl>
                                 </dl>
+                                @endif
                                 <dl>
                                 <dl>
                                     <dt>支付方式：</dt>
                                     <dt>支付方式：</dt>
                                     <dd style="width: 115px;">
                                     <dd style="width: 115px;">