Merge branch 'zjl_add_coupon_0202' into 'master'

添加优惠金额

See merge request !8

app/Http/Controllers/OrderController.php

@@ -71,6 +71,21 @@ function createMenu($menus, $url)
     return createMenuReal($menus, $actives, 0);
 }
 
+// 获取订单优惠券金额
+function getCoupon($order_id)
+{
+    $price = DB::connection('order')
+            ->table('lie_order_price')
+            ->where(['order_id' => $order_id, 'price_type' => -4])
+            ->first();
+
+    if ($price) {
+        return $price->price;
+    }
+
+    return null;
+}
+
 Class OrderController extends Controller
 {
     // 首页

public/js/order.js

@@ -79,7 +79,7 @@
                         listUrl += '&test_order=' + 1;
                     }
 
-                    if (!order_contain && !time_start && !time_end && !order_type_a && !order_pay_type && !order_status && !shipping_name && !order_send && !order_source_pf && !order_source_adtag && !test_order.is(':checked')) {
+                    if (!order_contain && !time_start && !time_end && !order_pay_type && !order_status && !shipping_name && !order_send && !order_source_pf && !order_source_adtag && !test_order.is(':checked')) {
                         listUrl = '/list';
                     }
 

resources/views/orderlist/content.blade.php

@@ -275,7 +275,9 @@
                                         <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">{{$v['com_name']}}</td>  
+                                        <td class="table-list-content">
+                                            <p class="show-title" title="{{$v['com_name']}}">{{$v['com_name']}}</p>
+                                        </td>  
                                     </tr>   
                                     <tr> 
                                         <td class="table-list-title">支付时间</td>
@@ -306,7 +308,11 @@
                                     </tr>
                                     <tr>
                                         <td class="table-list-title">Adtag或其它</td>
-                                        <td colspan="3">{{$v['order_source']}}</td>
+                                        <td class="table-list-content">
+                                            <p class="show-title" title="{{$v['order_source']}}">{{$v['order_source']}}</p>
+                                        </td>
+                                        <td class="table-list-title">优惠金额</td>
+                                        <td class="table-list-content"><?php echo App\Http\Controllers\getCoupon($v['order_id']); ?></td>
                                     </tr>
                                 </table>
                             </td>