|
@@ -231,8 +231,8 @@ class handler
|
|
};
|
|
};
|
|
|
|
|
|
$merchants = [];
|
|
$merchants = [];
|
|
- $column_values = ['平台单号','面额', '充值卡号', '充值卡类型', '是否转网', '下单日期', '完成日期', '订单状态'];
|
|
|
|
- $data_keys = ['order_sn', 'refill_amount', 'card_no', 'card_type_text', 'is_transfer_text', 'order_time_text', 'notify_time_text','order_state_text'];
|
|
|
|
|
|
+ $column_values = ['平台单号','面额', '充值卡号', '充值卡类型', '是否转网', '下单日期', '完成日期', '订单状态', '流水号'];
|
|
|
|
+ $data_keys = ['order_sn', 'refill_amount', 'card_no', 'card_type_text', 'is_transfer_text', 'order_time_text', 'notify_time_text','order_state_text', 'official_sn'];
|
|
if($export_type === 'merchant') {
|
|
if($export_type === 'merchant') {
|
|
$column_values = array_merge(['商户号', '商户订单号'], $column_values, ['扣款金额']);
|
|
$column_values = array_merge(['商户号', '商户订单号'], $column_values, ['扣款金额']);
|
|
$data_keys = array_merge(['mchid', 'mch_order'], $data_keys, ['mch_amount']);
|
|
$data_keys = array_merge(['mchid', 'mch_order'], $data_keys, ['mch_amount']);
|