Merge branch 'zjl_inner_account_20190221' into development

app/Model/OrderModel.php

@@ -342,7 +342,11 @@ class OrderModel extends Model
 
             $tmp[$i]['order_id']      = $order[$i]['order_id'];
             $tmp[$i]['order_sn']      = "\t".$order[$i]['order_sn']."\t";
+            
+            if ($order[$i]['order_goods_type'] == 2) {
                 $tmp[$i]['business_type'] = Config('params.business_type')[$order[$i]['business_type']]; // 自营其他业务类型
+            }
+
             $tmp[$i]['user_account']  = $order[$i]['mobile'] ? $order[$i]['mobile'] : $order[$i]['email'];
             // $tmp[$i]['is_new']     = $order[$i]['is_new'] == 1 ? '是' : '否'; // 是否为新用户