|
|
@@ -120,8 +120,17 @@ class OrderController extends Controller
|
|
120
|
120
|
if(!empty($goods)){
|
|
121
|
121
|
foreach($goods as $item){
|
|
122
|
122
|
$goods_name = Goods::where('id', $item->goods_id)->pluck('name');
|
|
123
|
|
- $props_name = GoodsSkus::where('id', $item->sku_id)->pluck('propsName');
|
|
124
|
|
- $v['goods'][] = $goods_name.'('.$props_name.') 数量/重量:'.$item->num.'';
|
|
|
123
|
+ $goods_sku_info = GoodsSkus::select('propsName', 'is_weigh')->where('id', $item->sku_id)->first();
|
|
|
124
|
+ if(!empty($goods_sku_info)){
|
|
|
125
|
+ $props_name = $goods_sku_info->propsName;
|
|
|
126
|
+ $is_weigh = $goods_sku_info->is_weigh;
|
|
|
127
|
+ $weigh_note = $is_weigh==1 ? '重量(斤)':'数量';
|
|
|
128
|
+ }else{
|
|
|
129
|
+ $props_name = '';
|
|
|
130
|
+ $weigh_note = '数量';
|
|
|
131
|
+ }
|
|
|
132
|
+
|
|
|
133
|
+ $v['goods'][] = $goods_name.'('.$props_name.') '.$weigh_note.':'.$item->num.'';
|
|
125
|
134
|
}
|
|
126
|
135
|
}
|
|
127
|
136
|
|
