|
|
@@ -234,11 +234,11 @@ class OrderClass extends BaseClass
|
|
|
$x = 0;
|
|
|
foreach ($orderList as $key => $orderData) {
|
|
|
if (!empty($orderData['itemList'])) {
|
|
|
- $orderData['itemList'] = array_merge(['virtualId' => 0], $orderData['itemList']);
|
|
|
+ $orderData['itemList'] = array_merge(['id' => -1], $orderData['itemList']);
|
|
|
foreach ($orderData['itemList'] as $k => $orderInfo) {
|
|
|
$i = $baseRow + $x;
|
|
|
$x++;
|
|
|
- if ($k == 0) {
|
|
|
+ if ($orderInfo['id'] == -1) {
|
|
|
$objPHPExcel->getActiveSheet()->setCellValue('A' . $i, $orderData['orderSn']);
|
|
|
$objPHPExcel->getActiveSheet()->setCellValue('B' . $i, $orderData['addTime']);
|
|
|
$objPHPExcel->getActiveSheet()->setCellValue('C' . $i, $orderData['payTime']);
|