|
|
@@ -337,10 +337,14 @@ class Order extends BaseController
|
|
337
|
337
|
if($data['count']<1){
|
|
338
|
338
|
return app('json')->fail('没有数据');
|
|
339
|
339
|
}
|
|
340
|
|
- $list=$this->orderList2($data['list']->toArray());
|
|
341
|
|
-// var_dump($list);die;
|
|
|
340
|
+ $list = $this->orderList2($data['list']->toArray());
|
|
|
341
|
+
|
|
|
342
|
+ // app()->make(ExcelRepository::class)->create($list, $this->request->adminId(), 'order', $this->request->merId());
|
|
|
343
|
+ $adminId = $this->request->adminId();
|
|
|
344
|
+ $excelLog = app()->make(ExcelRepository::class)->createNoJob($list, $adminId, 'order', $where['mer_id']);
|
|
|
345
|
+
|
|
|
346
|
+ app()->make(ExcelService::class)->order($list,$excelLog->excel_id);
|
|
342
|
347
|
|
|
343
|
|
- app()->make(ExcelRepository::class)->create($list, $this->request->adminId(), 'order', $this->request->merId());
|
|
344
|
348
|
return app('json')->success('开始导出数据');
|
|
345
|
349
|
}
|
|
346
|
350
|
public function orderList2(array $data){
|