Merge branch 'zjl_items_price_20180731' into development

app/Http/Controllers/OrderController.php

@@ -207,6 +207,14 @@ function clientSource($user_id)
     return $user->client_source;
 }
 
+// 获取自营商品型号
+function getGoodsName($goods_id)
+{
+    $goods_info = json_decode(Redis::hget('Self_SelfGoods', $goods_id), true);
+    
+    return $goods_info['goods_name'];
+}
+
 Class OrderController extends Controller
 {
     // 首页

resources/views/detail/content.blade.php

@@ -375,11 +375,16 @@
             <table class="table">
                 <thead>
                     <tr class="caption">
+                        <th>商品名</th>
+                        @if ($order_info['order_goods_type'] == 2)
                         <th>型号</th>
+                        @endif
                         <th>制造商</th>
                         <th>采购数量</th>
                         <th>采购单价</th>
-                        <th>小计</th>
+                        <th>采购小计</th>
+                        <th>优惠单价</th>
+                        <th>优惠小计</th>
                         <th>货期</th>
                         <th>供应商</th>
 
@@ -393,14 +398,14 @@
                 <tbody>
                 @if (!empty($order_items_info))
                     @foreach ($order_items_info as $v)
-                        <tr>
-                            <td>
+                        <tr> 
                             @if ($order_info['order_goods_type'] == 1)
-                                <a href="{{Config('website.main_url').'goods_'.$v['goods_id'].'.html?ptag=order'}}" target="_blank">{{$v['goods_name']}}</a>
+                                <td><a href="{{Config('website.main_url').'goods_'.$v['goods_id'].'.html?ptag=order'}}" target="_blank">{{$v['goods_name']}}</a></td>
                             @else
-                                <a href="{{Config('website.main_url').'item/'.$v['goods_id'].'.html?ptag=order'}}" target="_blank">{{$v['goods_name']}}</a>
+                                <td><a href="{{Config('website.main_url').'item/'.$v['goods_id'].'.html?ptag=order'}}" target="_blank">{{$v['goods_name']}}</a></td>
+                                <td>{{ App\Http\Controllers\getGoodsName($v['goods_id']) }}</td>
                             @endif
-                            </td>
+
                             <td>{{$v['brand_name']}}</td>
                             <td id="goods_number_{{$v['rec_id']}}">{{$v['goods_number']}}</td>
                             <td>
@@ -411,6 +416,8 @@
                                 <span id="total_{{$v['rec_id']}}">{{$v['goods_amount_format']}}</span>
                                 <!-- {$currency}<span id="total_{$v.rec_id}">{$v.total}</span> -->
                             </td>
+                            <td>{{$v['single_pre_price_format']}}</td>
+                            <td>{{$v['single_pre_price_amount']}}</td>
                             <td>{{$v['delivery_time']}}</td>
                             <td>{{$v['supplier_name']}}</td>