|
@@ -1508,15 +1508,15 @@ class Order
|
|
|
|
|
|
$parent = Dever::db('agent/member')->find(array('id'=>$v['parent_mid']));
|
|
$parent = Dever::db('agent/member')->find(array('id'=>$v['parent_mid']));
|
|
$parent_rolename = '';
|
|
$parent_rolename = '';
|
|
- if($parent){
|
|
|
|
|
|
+ if($parent && $parent['role']){
|
|
$parent_role = Dever::db('setting/role')->find(array('id'=>$parent['role']));
|
|
$parent_role = Dever::db('setting/role')->find(array('id'=>$parent['role']));
|
|
- $parent_rolename = $parent_role['name'];
|
|
|
|
|
|
+ if($parent_role && $parent_rolename){
|
|
|
|
+ $parent_rolename = $parent_role['name'];
|
|
|
|
+ }
|
|
if($prent['area']){
|
|
if($prent['area']){
|
|
$parent_area = Dever::load("area/api.string", $parent['area']);
|
|
$parent_area = Dever::load("area/api.string", $parent['area']);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
-
|
|
|
|
-
|
|
|
|
$process = Dever::db('agent/order_process')->state(array('order_id'=>$v['id']));
|
|
$process = Dever::db('agent/order_process')->state(array('order_id'=>$v['id']));
|
|
$chu = '';
|
|
$chu = '';
|
|
$zhong = '';
|
|
$zhong = '';
|
|
@@ -1545,11 +1545,13 @@ class Order
|
|
}
|
|
}
|
|
|
|
|
|
$order_cash = Dever::db('agent/order_cash')->find(array('order_id'=>$v['id']));
|
|
$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);
|
|
|
|
- if($fenrun){
|
|
|
|
- $admin = Dever::load('manage/admin-find',$fenrun['admin']);
|
|
|
|
- if($admin){
|
|
|
|
- $fr = $admin['username'];
|
|
|
|
|
|
+ if($order_cash && $order_cash['id']){
|
|
|
|
+ $fenrun = Dever::load('manage/api')->getLog($order_cash['id'], 'agent', 'order_cash', 1);
|
|
|
|
+ if($fenrun && $fenrun['admin']){
|
|
|
|
+ $admin = Dever::load('manage/admin-find',$fenrun['admin']);
|
|
|
|
+ if($admin){
|
|
|
|
+ $fr = $admin['username'];
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1557,23 +1559,24 @@ class Order
|
|
if($order_cash && $order_cash['cdate']){
|
|
if($order_cash && $order_cash['cdate']){
|
|
$frdate = date('Y-m-d H:i',$order_cash['cdate']);
|
|
$frdate = date('Y-m-d H:i',$order_cash['cdate']);
|
|
}
|
|
}
|
|
-
|
|
|
|
- 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']);
|
|
|
|
- $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['audit'] == 2){
|
|
|
|
- $audit = '拒绝';
|
|
|
|
- $admin = Dever::load('manage/admin-find',$log['admin']);
|
|
|
|
- $bh = $admin['username'];
|
|
|
|
- $audit_cdate = date('Y-m-d H:i',$admin['cdate']);
|
|
|
|
|
|
+ if($process){
|
|
|
|
+ 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']);
|
|
|
|
+ $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['audit'] == 2){
|
|
|
|
+ $audit = '拒绝';
|
|
|
|
+ $admin = Dever::load('manage/admin-find',$log['admin']);
|
|
|
|
+ $bh = $admin['username'];
|
|
|
|
+ $audit_cdate = date('Y-m-d H:i',$admin['cdate']);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
$d = array
|
|
$d = array
|