Merge branch 'zjl_adjust_20180925' into development

app/Http/Controllers/OrderController.php

@@ -608,7 +608,7 @@ Class OrderController extends Controller
             array('create_time_sec',  '下单时间'),
             array('create_time_sec',  '下单时间'),
             array('com_name',       '公司名称'),
             array('com_name',       '公司名称'),
             array('goods_name',     '商品型号'),
             array('goods_name',     '商品型号'),
-            array('supplier_name',  '制造商'),
+            array('brand_name',     '制造商'),
             array('goods_number',   '数量'),
             array('goods_number',   '数量'),
             array('goods_price',    '单价'),
             array('goods_price',    '单价'),
             array('goods_amount',   '商品小计'),
             array('goods_amount',   '商品小计'),
@@ -771,7 +771,7 @@ Class OrderController extends Controller
                 })
                 })
                 ->where('it.status', '<>', -1)
                 ->where('it.status', '<>', -1)
                 ->where('o.order_goods_type', '=', $map['order_goods_type'])
                 ->where('o.order_goods_type', '=', $map['order_goods_type'])
-                ->select('it.goods_id', 'it.goods_name', 'it.goods_number', 'it.goods_price', 'it.supplier_name', 'o.order_id', 'o.order_sn', 'o.order_pay_type', 'o.order_goods_type', 'o.order_source', 'o.create_time', 'o.status', 'o.order_amount', 'o.currency', 'o.sale_id', 'o.cancel_reason', 'i.tax_title', 'i.inv_type', 'i.invoice_status', 'a.consignee', 's.status as shipping_status', 'u.user_id', 'u.mobile', 'u.email', 'u.client_source', 'c.com_name', 'oe.send_remark')
+                ->select('it.goods_id', 'it.goods_name', 'it.goods_number', 'it.goods_price', 'it.brand_name', 'o.order_id', 'o.order_sn', 'o.order_pay_type', 'o.order_goods_type', 'o.order_source', 'o.create_time', 'o.status', 'o.order_amount', 'o.currency', 'o.sale_id', 'o.cancel_reason', 'i.tax_title', 'i.inv_type', 'i.invoice_status', 'a.consignee', 's.status as shipping_status', 'u.user_id', 'u.mobile', 'u.email', 'u.client_source', 'c.com_name', 'oe.send_remark')
                 ->groupBy('it.rec_id')
                 ->groupBy('it.rec_id')
                 ->orderBy('o.create_time', 'DESC')
                 ->orderBy('o.create_time', 'DESC')
                 ->get();
                 ->get();
@@ -865,7 +865,8 @@ Class OrderController extends Controller
             $tmp[$i]['goods_name'] = $order[$i]->order_goods_type == 1 ? $order[$i]->goods_name : getGoodsName($order[$i]->goods_id); 
             $tmp[$i]['goods_name'] = $order[$i]->order_goods_type == 1 ? $order[$i]->goods_name : getGoodsName($order[$i]->goods_id); 
             $tmp[$i]['goods_number'] = $order[$i]->goods_number; 
             $tmp[$i]['goods_number'] = $order[$i]->goods_number; 
             $tmp[$i]['goods_price'] = $order[$i]->goods_price;  
             $tmp[$i]['goods_price'] = $order[$i]->goods_price;  
-            $tmp[$i]['goods_amount'] = $order[$i]->goods_number*$order[$i]->goods_price; 
+            $tmp[$i]['goods_amount'] = $order[$i]->goods_number*$order[$i]->goods_price;
+            $tmp[$i]['brand_name'] = $order[$i]->brand_name;  
 
 
             if ($i > 0 && $order[$i]->order_id == $order[$i-1]->order_id) {
             if ($i > 0 && $order[$i]->order_id == $order[$i-1]->order_id) {
                 $tmp[$i]['order_sn'] = '';
                 $tmp[$i]['order_sn'] = '';
@@ -873,8 +874,7 @@ Class OrderController extends Controller
                 $tmp[$i]['consignee'] = '';
                 $tmp[$i]['consignee'] = '';
                 $tmp[$i]['create_time_date'] = ''; 
                 $tmp[$i]['create_time_date'] = ''; 
                 $tmp[$i]['create_time_sec'] = ''; 
                 $tmp[$i]['create_time_sec'] = ''; 
-                $tmp[$i]['com_name'] = ''; 
-                $tmp[$i]['supplier_name'] = ''; 
+                $tmp[$i]['com_name'] = '';
                 $tmp[$i]['goods_sum'] = '';
                 $tmp[$i]['goods_sum'] = '';
                 $tmp[$i]['shipping_fee'] = '';
                 $tmp[$i]['shipping_fee'] = '';
                 $tmp[$i]['extra_fee'] = '';
                 $tmp[$i]['extra_fee'] = '';
@@ -898,7 +898,6 @@ Class OrderController extends Controller
                 $tmp[$i]['create_time_date'] = date('Y-m-d', $order[$i]->create_time); 
                 $tmp[$i]['create_time_date'] = date('Y-m-d', $order[$i]->create_time); 
                 $tmp[$i]['create_time_sec'] = date('H:i:s', $order[$i]->create_time); 
                 $tmp[$i]['create_time_sec'] = date('H:i:s', $order[$i]->create_time); 
                 $tmp[$i]['com_name'] = isset($order[$i]->tax_title) ? $order[$i]->tax_title : ''; 
                 $tmp[$i]['com_name'] = isset($order[$i]->tax_title) ? $order[$i]->tax_title : ''; 
-                $tmp[$i]['supplier_name'] = $order[$i]->supplier_name; 
                 $tmp[$i]['goods_sum'] = $this->getOrderPrice($order[$i]->order_id, 1);
                 $tmp[$i]['goods_sum'] = $this->getOrderPrice($order[$i]->order_id, 1);
                 $tmp[$i]['shipping_fee'] = $this->getOrderPrice($order[$i]->order_id, 3);
                 $tmp[$i]['shipping_fee'] = $this->getOrderPrice($order[$i]->order_id, 3);
                 $tmp[$i]['extra_fee'] = $this->getOrderPrice($order[$i]->order_id, 2);
                 $tmp[$i]['extra_fee'] = $this->getOrderPrice($order[$i]->order_id, 2);