Commit 11573682 by 朱继来

添加快递单号

parent eae64ece
...@@ -110,11 +110,11 @@ function getShipping($order_id) ...@@ -110,11 +110,11 @@ function getShipping($order_id)
$shipping = DB::connection('order') $shipping = DB::connection('order')
->table('lie_order_shipping') ->table('lie_order_shipping')
->where(['order_id' => $order_id, 'shipping_type' => 1]) ->where(['order_id' => $order_id, 'shipping_type' => 1])
->select('status') ->select('shipping_no', 'status')
->first(); ->first();
if (!empty($shipping)) { if (!empty($shipping)) {
return $shipping->status; return $shipping;
} }
return false; return false;
......
...@@ -233,10 +233,10 @@ ...@@ -233,10 +233,10 @@
</td> </td>
<td class="show-list" class="show-list"> <td class="show-list" class="show-list">
<?php <?php
$status = App\Http\Controllers\getShipping($v['order_id']); $shipping = App\Http\Controllers\getShipping($v['order_id']);
if ($status) { if ($shipping) {
switch ($status) { switch ($shipping->status) {
case 1: echo '已配送'; break; case 1: echo '已配送'; break;
case 2: echo '已签收'; break; case 2: echo '已签收'; break;
default: echo '未配送'; break; default: echo '未配送'; break;
...@@ -340,9 +340,12 @@ ...@@ -340,9 +340,12 @@
<td class="table-list-title">优惠金额</td> <td class="table-list-title">优惠金额</td>
<td class="table-list-content"><?php echo App\Http\Controllers\getCoupon($v['order_id']); ?></td> <td class="table-list-content"><?php echo App\Http\Controllers\getCoupon($v['order_id']); ?></td>
</tr> </tr>
<tr> <tr>
<td class="table-list-title">快递单号</td>
<td class="table-list-content">{{$shipping ? $shipping->shipping_no : ''}}
</td>
<td class="table-list-title">Adtag或其它</td> <td class="table-list-title">Adtag或其它</td>
<td class="table-list-content" colspan="3"> <td class="table-list-content">
<p class="show-title" title="{{$v['order_source']}}">{{$v['order_source']}}</p> <p class="show-title" title="{{$v['order_source']}}">{{$v['order_source']}}</p>
</td> </td>
</tr> </tr>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment