Merge branch 'zjl_order_source_20180904' into development

app/Http/Controllers/OrderController.php

@@ -261,6 +261,16 @@ function handleOrderSource($order_source)
     return implode(',', $source);
 }
 
+// 获取订单收货人
+function getOrderAddress($order_id)
+{
+    $order = DB::connection('order')->table('lie_order_address')->where('order_id', $order_id)->select('consignee')->first();
+
+    if (!$order) return false;
+
+    return $order->consignee;
+}
+
 Class OrderController extends Controller
 {
     // 首页

resources/views/orderlist/content.blade.php

@@ -183,6 +183,7 @@
                 <thead>
                 <tr>                  
                     <th class="pl30">会员账号</th>
+                    <th class="pl30">订单编号</th>
                     <th class="pl30">应付金额</th>
                     <th class="pl30">订单状态</th>
                     <th class="pl30">订单类型</th>
@@ -190,6 +191,7 @@
                     <th class="pl30">推送业务员</th>
                     <th class="pl30">发货状态</th>
                     <th class="pl30">同步状态</th>
+                    <th class="pl30">收货人</th>                   
                     <th class="pl30">下单时间</th>                   
                     <th class="pl30">操作</th>
                 </tr>
@@ -203,7 +205,8 @@
                 <tbody>
                     @foreach ($list as $v)
                         <tr>
-                            <td class="show-list">{{$v['mobile'] ? $v['mobile'] : $v['email']}}</td>   
+                            <td class="show-list">{{$v['mobile'] ? $v['mobile'] : $v['email']}}</td> 
+                            <td class="show-list">{{$v['order_sn']}}</td>  
                             <td class="show-list">
                                 <?php 
                                     $currencySign = $v['currency'] == 1 ? '￥' : '$';
@@ -273,6 +276,7 @@
                                     }
                                 ?>
                             </td>
+                            <td><?php echo App\Http\Controllers\getOrderAddress($v['order_id']); ?></td>
                             <td class="show-list">{{$username != 'vpadmin@ichunt.com' ? date('Y-m-d H:i:s', $v['create_time']) : date('Y-m-d', $v['create_time'])}}</td>
                             <td>
                                 <div class="btn-group btn-group-xs">
@@ -304,15 +308,17 @@
 
                         <!-- 点击展示内容 -->
                         <tr class="show-other-content">
-                            <td colspan="10">
+                            <td colspan="12">
                                 <table class="table table-hover table-bordered">
                                     <tr>
-                                        <td class="table-list-title">订单编号</td>
-                                        <td class="table-list-content">{{$v['order_sn']}}</td>
                                         <td class="table-list-title">公司名称</td>
                                         <td class="table-list-content">
                                             <p class="show-title" title="{{App\Http\Controllers\getCompanyName($v['user_id'])}}">{{App\Http\Controllers\getCompanyName($v['user_id'])}}</p>
                                         </td>  
+                                        <td class="table-list-title">Adtag或其它</td>
+                                        <td class="table-list-content" colspan="3">
+                                            <p class="show-title" title="<?php echo App\Http\Controllers\handleOrderSource($v['order_source']); ?>"><?php echo App\Http\Controllers\handleOrderSource($v['order_source']); ?></p>
+                                        </td>
                                     </tr>   
                                     @if ($v['order_pay_type'] == 2) 
                                     <tr>
@@ -383,12 +389,6 @@
                                             <?php echo App\Http\Controllers\getOrderSource($v['order_id']); ?>
                                         </td> 
                                     </tr>
-                                    <tr>
-                                        <td class="table-list-title">Adtag或其它</td>
-                                        <td class="table-list-content" colspan="3">
-                                            <p class="show-title" title="<?php echo App\Http\Controllers\handleOrderSource($v['order_source']); ?>"><?php echo App\Http\Controllers\handleOrderSource($v['order_source']); ?></p>
-                                        </td>
-                                    </tr>
                                 </table>
                             </td>
                         </tr>