edit

service/agent/lib/Dhorder.php

@@ -1192,6 +1192,10 @@ class Dhorder
                     $sku = '';
                 }
             }
+            $member_goods = Dever::db('agent/member_goods')->state(array('type'=>$v['type'],'type_id'=>$v['type_id']));
+            foreach($member_goods as $k1 => $v1){
+                $quanyi = date('Y-m-d H:i',$v1['cdate']);
+            }
             $goods_status = Dever::db('agent/dh_order')->config['status'];
             $status = Dever::status($goods_status, $v['status']);
             $d = array
@@ -1212,8 +1216,8 @@ class Dhorder
                 date('Y-m-d H:i',$v['cdate']),
                 date('Y-m-d H:i',$v['fdate']),
                 $v['audit_desc'],
-                date('Y-m-d H:i',$v['fdate']),
-                date('Y-m-d H:i',$v['fdate']),
+                $quanyi,
+                $quanyi,
 
             );
             $body[] = $d;

service/agent/lib/Order.php

@@ -1320,35 +1320,36 @@ class Order
             $chushen = '';
             $zhongshen = '';
             $audit_cdate = '';
+
+            $member_goods_log = Dever::db('agent/member_goods_log')->find(array('parent_order_num'=>$v['order_num']));
+            $quanyi = Dever::load('manage/api')->getLog($member_goods_log['id'], 'agent', 'member_goods_log', 1);
+            $admin = Dever::load('manage/admin-find',$quanyi['admin']);
+            $qy = $admin['username'];
+            $qydate = date('Y-m-d H:i',$admin['cdate']);
+            $order_cash = Dever::db('agent/order_cash')->find(array('order_id'=>$v['id']));
+            $fenrun = Dever::load('manage/api')->getLog($order_cash['id'], 'agent', 'order_cash', 1);
+            $admin = Dever::load('manage/admin-find',$fenrun['admin']);
+            $fr = $admin['username'];
+            $frdate = date('Y-m-d H:i',$admin['cdate']);
             foreach($process as $key => $val){
-                if($val['status'] == 1){
-                    $chushen = date('Y-m-d H:i',$val['cdate']);
-                }elseif($val['status'] == 2){
-                    $zhongshen = date('Y-m-d H:i',$val['cdate']);
-                }
-                
                 $log = Dever::load('manage/api')->getLog($val['id'], 'agent', 'order_process', 1);
                 if($val['status'] == 1){
+                    $chushen = date('Y-m-d H:i',$val['cdate']);
                     $admin = Dever::load('manage/admin-find',$log['admin']);
                     $chu = $admin['username'];
                 }elseif($val['status'] == 2){
+                    $zhongshen = date('Y-m-d H:i',$val['cdate']);
                     $admin = Dever::load('manage/admin-find',$log['admin']);
                     $zhong = $admin['username'];
                 }
-                if($val['type'] == 3){
-                    $admin = Dever::load('manage/admin-find',$log['admin']);
-                    $qy = $admin['username'];
-                }elseif($val['type'] == 3){
-                    $admin = Dever::load('manage/admin-find',$log['admin']);
-                    $fr = $admin['username'];
-                }
+                
                 if($val['audit'] == 1){
                     $audit = '审核通过';
                 }elseif($val['audit'] == 2){
                     $audit = '拒绝';
-                    $audit_cdate = date('Y-m-d H:i',$val['cdate']);
                     $admin = Dever::load('manage/admin-find',$log['admin']);
                     $bh = $admin['username'];
+                    $audit_cdate = date('Y-m-d H:i',$admin['cdate']);
                 }
             }
             $d = array
@@ -1371,9 +1372,9 @@ class Order
                 $zhongshen,
                 $zhong,
                 $audit,
-                date('Y-m-d H:i',$v['fdate']),
+                $frdate,
                 $fr,
-                date('Y-m-d H:i',$v['fdate']),
+                $qydate,
                 $qy,
                 $v['audit_desc'],
                 $audit_cdate,