rabin 1 year ago
parent
commit
f1f919c579
2 changed files with 7 additions and 7 deletions
  1. 6 6
      src/dai/seller/lib/Manage.php
  2. 1 1
      src/dai/seller/lib/Order.php

+ 6 - 6
src/dai/seller/lib/Manage.php

@@ -438,7 +438,7 @@ class Manage extends Auth
                 array('商品', $goods),
                 array('数量', $data['num']),
                 array('商户请求参数', $data['seller_request']),
-                array('请求时间', date('Y-m-d H:i', $data['cdate'])),
+                array('请求时间', date('Y-m-d H:i:s', $data['cdate'])),
             ), 
         );
         $result['content'][] = array
@@ -456,11 +456,11 @@ class Manage extends Auth
             ), 
         );
 
-        $order_error = Dever::db('order_error', 'seller')->select(array('order_num' => $data['order_num']));
+        $order_error = Dever::db('order_error', 'seller')->select(array('order_num' => $data['order_num']), array('order' => 'id asc'));
         if ($order_error) {
             foreach ($order_error as $k => $v) {
                 $error_channel = Dever::db('info', 'channel')->find($v['channel_id']);
-                $content = $this->showOrderExpandContent($error_channel, $data);
+                $content = $this->showOrderExpandContent($error_channel, $v);
                 $result['content'][] = array
                 (
                     'title' => '轮巡渠道失败信息-' . ($k+1),
@@ -496,7 +496,7 @@ class Manage extends Auth
             'content' => array
             (
                 array('商户响应信息', $data['seller_callback']),
-                array('响应时间', $data['seller_callback_date'] ? date('Y-m-d H:i', $data['seller_callback_date']) : '-'),
+                array('响应时间', $data['seller_callback_date'] ? date('Y-m-d H:i:s', $data['seller_callback_date']) : '-'),
                 array('响应次数', $data['seller_callback_num']),
             ), 
         );
@@ -512,7 +512,7 @@ class Manage extends Auth
         if ($info['channel_order_num']) {
             $content[] = array('渠道订单号', $info['channel_order_num']);
         }
-        $content[] = array('请求时间', $info['channel_order_date'] ? date('Y-m-d H:i', $info['channel_order_date']) : '-');
+        $content[] = array('请求时间', $info['channel_order_date'] ? date('Y-m-d H:i:s', $info['channel_order_date']) : '-');
         if ($info['channel_request']) {
             $content[] = array('请求信息', $info['channel_request']);
         }
@@ -523,7 +523,7 @@ class Manage extends Auth
             $content[] = array('回调信息', $info['channel_callback']);
         }
         if ($info['channel_callback_date']) {
-            $content[] = array('回调时间', date('Y-m-d H:i', $info['channel_callback_date']));
+            $content[] = array('回调时间', date('Y-m-d H:i:s', $info['channel_callback_date']));
         }
         if (isset($info['official_order_num']) && $info['official_order_num']) {
             $content[] = array('官方流水号', '<span>' . $info['official_order_num'] . '</span>');

+ 1 - 1
src/dai/seller/lib/Order.php

@@ -303,7 +303,7 @@ class Order
                     $order_error['channel_request'] = $info['channel_request'];
                     $order_error['channel_response'] = $info['channel_response'];
                     $order_error['channel_callback'] = $info['channel_callback'];
-                    $order_error['channel_callback_date'] = $info['channel_callback_date'];
+                    $order_error['channel_callback_date'] = time();
                     Dever::db('order_error', 'seller')->insert($order_error);
                     return Dever::load('order', 'seller')->handleAct($info, $selected);
                 }