Merge branch 'hotfix/orderquery' of wmtx/platform into release

到账时间导出

Application/Home/Controller/DownloadController.class.php

@@ -4675,7 +4675,7 @@ public function iosDetailExcelInfo($id,$map) {
                  // $value1['user_account'] = substr_replace($value1['user_account'],'************',3,12);
                  $value1['user_account'] = $this->encryption($value1['user_account']);
                  $value1['pay_order_number'] = $this->encryption($value1['pay_order_number']);
-                 $value1['pay_time'] = ($value1['pay_status'] == 1) ? date('Y-m-d H:i:s', $value1['pay_time']) : '--';
+                 $value1['payed_time'] = ($value1['pay_status'] == 1) ? date('Y-m-d H:i:s', $value1['payed_time']) : '--';
                  $value1['pay_status'] = isset(self::$payStatus[$value1['pay_status']]) ? self::$payStatus[$value1['pay_status']] : "未知状态";
                  $value1['sdk_version'] = getSDKTypeName($value1['sdk_version']);
                  switch ($value1['level']) {
@@ -4714,8 +4714,8 @@ public function iosDetailExcelInfo($id,$map) {
                  $csvData["p_p_proinfo"] = $value1["p_p_proinfo"];
                  $csvData["p_proinfo"] = $value1["p_proinfo"];
                  $csvData["proinfo"] = $value1["proinfo"];
-                 $csvData["spend_time"] = $value1["spend_time"];
-                 $csvData["payed_time"] = $value1["pay_time"];
+                 $csvData["spend_time"] = date('Y-m-d H:i:s', $value1["spend_time"]);
+                 $csvData["payed_time"] = $value1["payed_time"];
                  mb_convert_variables('GBK', 'UTF-8', $csvData);
                  fputcsv($fp, $csvData);
                  $xlsData[] = $csvData;