|
@@ -130,20 +130,7 @@ class OrderController extends Controller
|
130
|
130
|
if($etime) $query->where('createTime', '<=', $etime);
|
131
|
131
|
})->where('is_del',0)->where('warehouse', $warehouse)->orderBy('id', 'desc')->offset($offset)->limit($pageSize)->get();
|
132
|
132
|
$result = json_decode(json_encode($result),true);
|
133
|
|
-
|
134
|
|
- foreach($result as $k=>&$v){
|
135
|
|
- /*
|
136
|
|
- //获取商品信息
|
137
|
|
- $v['goods'] = '';
|
138
|
|
- $goods = DB::table('order_goods')->where('outerParentCode', $v['outerCode'])->get();
|
139
|
|
- foreach($goods as $item){
|
140
|
|
- $v['goods'][] = $item->goodsName.' 单价:¥'.$item->price.' 件数:'.$item->quantity.'';
|
141
|
|
- }
|
142
|
|
- */
|
143
|
|
-
|
144
|
|
- $v['receiverMobile'] = substr($v['receiverMobile'], 0, 3).'****'.substr($v['receiverMobile'], 7);
|
145
|
|
- }
|
146
|
|
-
|
|
133
|
+
|
147
|
134
|
$adminList = DB::table('admin')->select('id', 'realname', 'username')->where('id','>', 1)->get();
|
148
|
135
|
$adminList = json_decode(json_encode($adminList), true);
|
149
|
136
|
return view('order/warehouselist', ['result' =>$result,
|