|
@@ -1307,24 +1307,7 @@ class Order
|
|
|
}
|
|
|
$role = Dever::db('setting/role')->find(array('id'=>$v['role']));
|
|
|
$area = Dever::load("area/api.string", $v['area']);
|
|
|
- $order_process=Dever::db('agent/order_process')->one(array('order_id'=>$v['id'],'state'=>1));
|
|
|
- $chushen = '';
|
|
|
- $zhongshen = '';
|
|
|
- if($order_process['status'] == 1){
|
|
|
- $chushen = date('Y-m-d H:i',$order_process['cdate']);
|
|
|
- }elseif($order_process['status'] == 2){
|
|
|
- $zhongshen = date('Y-m-d H:i',$order_process['cdate']);
|
|
|
- }else{
|
|
|
- $chushen = '';
|
|
|
- $zhongshen = '';
|
|
|
- }
|
|
|
- $audit_cdate = '';
|
|
|
- if($order_process['audit'] == 1){
|
|
|
- $audit = '审核通过';
|
|
|
- }elseif($order_process['audit'] == 2){
|
|
|
- $audit = '拒绝';
|
|
|
- $audit_cdate = date('Y-m-d H:i',$order_process['cdate']);
|
|
|
- }
|
|
|
+
|
|
|
$parent = Dever::db('agent/member')->find(array('id'=>$v['parent_mid']));
|
|
|
$parent_role = Dever::db('setting/role')->find(array('id'=>$parent['role']));
|
|
|
$parent_area = Dever::load("area/api.string", $parent['area']);
|
|
@@ -1334,7 +1317,16 @@ class Order
|
|
|
$qy = '';
|
|
|
$fr = '';
|
|
|
$bh = '';
|
|
|
+ $chushen = '';
|
|
|
+ $zhongshen = '';
|
|
|
+ $audit_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){
|
|
|
$admin = Dever::load('manage/admin-find',$log['admin']);
|
|
@@ -1350,7 +1342,11 @@ class Order
|
|
|
$admin = Dever::load('manage/admin-find',$log['admin']);
|
|
|
$fr = $admin['username'];
|
|
|
}
|
|
|
- if($val['audit'] == 2){
|
|
|
+ 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'];
|
|
|
}
|