diff --git a/crmeb/services/ExcelService.php b/crmeb/services/ExcelService.php index 4e369c1c..af286481 100644 --- a/crmeb/services/ExcelService.php +++ b/crmeb/services/ExcelService.php @@ -406,31 +406,29 @@ class ExcelService if (!$where['is_mer']) { $header = ['商户类别', '商户分类', '商户名称', '总订单号', '订单编号', '交易流水号', '交易时间', '对方信息', '交易类型', '收支金额', '备注']; $list = $query->page($page, $limit)->order('create_time DESC')->select(); - foreach ($list as $value) { + foreach ($list as $k => $value) { $order = $order_make->get($value['order_id']); if ($value['merchant']) { - $export[] = [ + $export[$k] = [ $value['merchant']['is_trader'] ? '自营' : '非自营', $value['merchant']['merchantCategory']['category_name'] ?? '平台', $value['merchant']['mer_name'] ?? '平台', ]; }else{ - $export[] = [ + $export[$k] = [ '平台', '平台', '平台', ]; } - $export[] = [ - $order['groupOrder']['group_order_sn'] ?? '无数据', - $value['order_sn'], - $value['financial_record_sn'], - $value['create_time'], - $value['user_info'], - $financialType[$value['financial_type']], - (in_array($value['financial_type'], $sys_pm_1) ? '+' : '-') . $value['number'], - '' - ]; + $export[$k][] = ['groupOrder']['group_order_sn'] ?? '无数据'; + $export[$k][] = $value['order_sn']; + $export[$k][] = $value['financial_record_sn']; + $export[$k][] = $value['create_time']; + $export[$k][] = $value['user_info']; + $export[$k][] = $financialType[$value['financial_type']]; + $export[$k][] = (in_array($value['financial_type'], $sys_pm_1) ? '+' : '-') . $value['number']; + $export[$k][] = ''; } $foot = [ '合计:平台应入账手续费 ' . $charge,