|
|
@@ -1178,8 +1178,13 @@ class Dhorder
|
|
|
foreach($data as $k => $v){
|
|
|
$member = Dever::db('agent/member')->find(array('id'=>$v['mid']));
|
|
|
$role = Dever::db('setting/role')->find(array('id'=>$member['role']));
|
|
|
- $address = Dever::db('agent/member_address')->find(array('id'=>$v['address_id']));
|
|
|
- $res=Dever::load('agent/address')->getOne($address['mid'],$address['id']);
|
|
|
+ if ($v['address_id'] && $v['address_id'] > 0) {
|
|
|
+ $address = Dever::db('agent/member_address')->find(array('id'=>$v['address_id']));
|
|
|
+ if ($address) {
|
|
|
+ $res=Dever::load('agent/address')->getOne($address['mid'],$address['id']);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
$goods = Dever::db('agent/dh_order_goods')->select(array('order_id' => $v['id']));
|
|
|
foreach ($goods as $k1 => $v1) {
|
|
|
$num = $v1['num'];
|
|
|
@@ -1209,9 +1214,9 @@ class Dhorder
|
|
|
$member['name'],
|
|
|
$role['name'],
|
|
|
$member['mobile'],
|
|
|
- $address['contact'],
|
|
|
- $address['mobile'],
|
|
|
- $res['address_info'].$address['house_number'],
|
|
|
+ isset($address['contact']) ? $address['contact'] : '',
|
|
|
+ isset($address['mobile']) ? $address['mobile'] : '',
|
|
|
+ (isset($res['address_info']) ? $res['address_info'] : '').(isset($address['house_number']) ? $address['house_number'] : ''),
|
|
|
$goods_info['name'],
|
|
|
$sku,
|
|
|
$num,
|
rabin