|
@@ -195,7 +195,7 @@ class OrderClass extends BaseClass
|
|
|
$objPHPExcel->getActiveSheet()->setCellValue('H1', '客户手机号');
|
|
$objPHPExcel->getActiveSheet()->setCellValue('H1', '客户手机号');
|
|
|
$objPHPExcel->getActiveSheet()->setCellValue('I1', '在线支付');
|
|
$objPHPExcel->getActiveSheet()->setCellValue('I1', '在线支付');
|
|
|
$objPHPExcel->getActiveSheet()->setCellValue('J1', '结清状态');
|
|
$objPHPExcel->getActiveSheet()->setCellValue('J1', '结清状态');
|
|
|
- $objPHPExcel->getActiveSheet()->setCellValue('K1', '编号');
|
|
|
|
|
|
|
+ $objPHPExcel->getActiveSheet()->setCellValue('K1', '已优惠');
|
|
|
$objPHPExcel->getActiveSheet()->setCellValue('L1', '备注');
|
|
$objPHPExcel->getActiveSheet()->setCellValue('L1', '备注');
|
|
|
$objPHPExcel->getActiveSheet()->setCellValue('M1', '开单人');
|
|
$objPHPExcel->getActiveSheet()->setCellValue('M1', '开单人');
|
|
|
$objPHPExcel->getActiveSheet()->setCellValue('N1', '花材Id');
|
|
$objPHPExcel->getActiveSheet()->setCellValue('N1', '花材Id');
|
|
@@ -303,7 +303,7 @@ class OrderClass extends BaseClass
|
|
|
$objPHPExcel->getActiveSheet()->setCellValue('H' . $i, $orderData['customMobile']);
|
|
$objPHPExcel->getActiveSheet()->setCellValue('H' . $i, $orderData['customMobile']);
|
|
|
$objPHPExcel->getActiveSheet()->setCellValue('I' . $i, $orderData['onlinePay'] == 1 ? '否' : '是');
|
|
$objPHPExcel->getActiveSheet()->setCellValue('I' . $i, $orderData['onlinePay'] == 1 ? '否' : '是');
|
|
|
$objPHPExcel->getActiveSheet()->setCellValue('J' . $i, $orderData['debt'] == 1 ? '未结清' : '已结清');
|
|
$objPHPExcel->getActiveSheet()->setCellValue('J' . $i, $orderData['debt'] == 1 ? '未结清' : '已结清');
|
|
|
- $objPHPExcel->getActiveSheet()->setCellValue('K' . $i, $orderData['sendNum']);
|
|
|
|
|
|
|
+ $objPHPExcel->getActiveSheet()->setCellValue('K' . $i, $orderData['discountAmount']);
|
|
|
$objPHPExcel->getActiveSheet()->setCellValue('L' . $i, $orderData['remark']);
|
|
$objPHPExcel->getActiveSheet()->setCellValue('L' . $i, $orderData['remark']);
|
|
|
$objPHPExcel->getActiveSheet()->setCellValue('M' . $i, $orderData['shopAdminName']);
|
|
$objPHPExcel->getActiveSheet()->setCellValue('M' . $i, $orderData['shopAdminName']);
|
|
|
$objPHPExcel->getActiveSheet()->setCellValue('N' . $i, $orderInfo['productId']);
|
|
$objPHPExcel->getActiveSheet()->setCellValue('N' . $i, $orderInfo['productId']);
|