Your Name 3 年之前
父节点
当前提交
0eb83e4061
共有 1 个文件被更改,包括 9 次插入12 次删除
  1. 9 12
      service/agent/lib/Order.php

+ 9 - 12
service/agent/lib/Order.php

@@ -1578,26 +1578,23 @@ class Order
                 foreach($process as $key => $val){
                     $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']);
-                        if($log && $log['admin']){
+                        if($process && $process['admin']){
+                            $admin = Dever::load('manage/admin-find',$log['admin']);
+                            $chu = $admin['username'];
+                        }elseif($log && $log['admin']){
                             $admin = Dever::load('manage/admin-find',$log['admin']);
                             $chu = $admin['username'];
                         }
+                        $chushen = date('Y-m-d H:i',$val['cdate']);
                         
                     }elseif($val['status'] == 2){
                         $zhongshen = date('Y-m-d H:i',$val['cdate']);
-                        if($log && $log['admin']){
+                        if($process && $process['admin']){
                             $admin = Dever::load('manage/admin-find',$log['admin']);
-                            $zhong = $admin['username'];
-                        }
-                    }
-                    if($val['audit'] == 2){
-                        $audit = '拒绝';
-                        $bh = $admin['username'];
-                        if($log && $log['admin']){
+                            $zhong  = $admin['username'];
+                        }elseif($log && $log['admin']){
                             $admin = Dever::load('manage/admin-find',$log['admin']);
-                            
-                            $audit_cdate = date('Y-m-d H:i',$admin['cdate']);
+                            $zhong  = $admin['username'];
                         }
                     }
                 }