Merge branch 'zjl_commit_20200526'

app/Model/OrderModel.php

@@ -335,6 +335,7 @@ class OrderModel extends Model
             '1' => '自采',
             '2' => '立创',
             '3' => '京北',
+            '4' => '油柑网',
         );
 
         $tmp = array();
@@ -461,7 +462,7 @@ class OrderModel extends Model
                 $tmp[$i]['sale_type']     = $order[$i]['sale_type'] == 1 ? '现卖' : '预售';
                 // 自营其他业务类型
                 $tmp[$i]['business_type'] = $order[$i]['business_type'] ? Config('params.business_type')[$order[$i]['business_type']] : '正常订单'; 
-                $tmp[$i]['self_supplier_type'] = $self_supplier_type[$order[$i]['self_supplier_type']]; // 自采标记
+                $tmp[$i]['self_supplier_type'] = isset($self_supplier_type[$order[$i]['self_supplier_type']]) ? $self_supplier_type[$order[$i]['self_supplier_type']] : '未知'; // 自采标记
                 $tmp[$i]['sample_demand_desc'] = $order[$i]['sample_demand_desc']; // 样片项目需求描述
                 //收货地址的电话
                 $tmp[$i]['receiving_address']  = isset($current_order_addr['mobile']) ? $current_order_addr['mobile'] : '';