|
@@ -1511,9 +1511,12 @@ class Order
|
|
|
if($parent){
|
|
|
$parent_role = Dever::db('setting/role')->find(array('id'=>$parent['role']));
|
|
|
$parent_rolename = $parent_role['name'];
|
|
|
+ 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']));
|
|
|
$chu = '';
|
|
|
$zhong = '';
|
|
@@ -1543,8 +1546,13 @@ class Order
|
|
|
|
|
|
$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'];
|
|
|
+ if($fenrun){
|
|
|
+ $admin = Dever::load('manage/admin-find',$fenrun['admin']);
|
|
|
+ if($admin){
|
|
|
+ $fr = $admin['username'];
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
$frdate = '';
|
|
|
if($order_cash['cdate']){
|
|
|
$frdate = date('Y-m-d H:i',$order_cash['cdate']);
|