Merge branch 'master' of ssh://git.dever.cc:10022/dever-product/churen

service/agent/lib/Dhorder.php

@@ -1395,7 +1395,7 @@ class Dhorder
         $body_member = array();
         // $data = Dever::db('agent/member_goods')->getSearchAll($where);
         foreach ($data as $k => $v) {
-            $member_goods[] = Dever::db('agent/member_goods')->getOne(array('mid'=>$v['id'],'type'=>'1,2'));
+            $member_goods[] = Dever::db('agent/member_goods')->getTOne(array('mid'=>$v['id'],'type'=>'1,2'));
         }
         foreach($member_goods as $k => $v){
             if($v){

service/bill/lib/Sell.php

@@ -187,7 +187,14 @@ class Sell
             $member = Dever::db('agent/member')->find($v['mid']);
             $role = Dever::db('setting/role')->find($member['role']);
             $area = Dever::load("area/api.string", $member['area'], '-', true, '');
-            $child = Dever::db('agent/member')->find($v['child_mid']);
+            $child_name = '';
+            $child_mobile = '';
+            if($v['child_mid'] && $v['child_mid'] > 0){
+                $child = Dever::db('agent/member')->find($v['child_mid']);
+                $child_name = $child['name'];
+                $child_mobile = $child['mobile'];
+            }
+            
             $cdate = '-';
             if($v['cdate']){
                 $cdate = date('Y-m-d H:i',$v['cdate']);
@@ -198,8 +205,8 @@ class Sell
                 $member['mobile'],
                 $role['name'],
                 $area,
-                $child['name'],
-                $child['mobile'],
+                $child_name,
+                $child_mobile,
                 $v['num'],
                 $cdate,
             );