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

service/agent/lib/Order.php

@@ -1855,34 +1855,39 @@ class Order
     }
 
     public  function out_guidian($data){
-        $header = array('代理商名称', '电话', '角色', '审核完成时间', '归店业绩', '门店名称', '门店编号', '归店时间');
+        $header = array('代理商名称', '电话', '角色', '审核完成时间','上级代理商姓名','上级代理商电话', '归店业绩', '门店名称', '门店编号', '归店时间');
         $body = array();
         foreach($data as $k => $v){
             $member_shop = Dever::db('agent/member_shop_log')->find(array('mid'=>$v['parent_mid']));
             if ($member_shop) {
-                $member = Dever::db('agent/member')->find($v['mid']);
-                $role = Dever::db('setting/role')->find($member['role']);
-                $shop = Dever::db('shop/info')->find($member_shop['new_shop_id']);
-                $fdate = '';
-                if ($v['fdate']) {
-                    $fdate = date('Y-m-d H:i',$v['fdate']);
-                }
-                $gcdate = '';
-                if ($member_shop['cdate']) {
-                    $gcdate = date('Y-m-d H:i',$member_shop['cdate']);
+                if ($v['fdate'] > $member_shop['cdate'] || ($v['fdate'] < $member_shop['cdate'] && date('Ym',$v['fdate']) == date('Ym',$member_shop['cdate']))) {
+                    $member = Dever::db('agent/member')->find($v['mid']);
+                    $parent_member = Dever::db('agent/member')->find(array('id'=>$v['parent_mid']));
+                    $role = Dever::db('setting/role')->find($member['role']);
+                    $shop = Dever::db('shop/info')->find($member_shop['new_shop_id']);
+                    $fdate = '';
+                    if ($v['fdate']) {
+                        $fdate = date('Y-m-d H:i',$v['fdate']);
+                    }
+                    $gcdate = '';
+                    if ($member_shop['cdate']) {
+                        $gcdate = date('Y-m-d H:i',$member_shop['cdate']);
+                    }
+                    $d = array
+                    (
+                        $member['name'],
+                        $member['mobile'],
+                        $role['name'],
+                        $fdate,
+                        $parent_member['name'],
+                        $parent_member['mobile'],
+                        $v['price'],
+                        $shop['name'],
+                        $shop['sid'],
+                        $gcdate,
+                    );
+                     $body[] = $d;
                 }
-                $d = array
-                (
-                    $member['name'],
-                    $member['mobile'],
-                    $role['name'],
-                    $fdate,
-                    $v['price'],
-                    $shop['name'],
-                    $shop['sid'],
-                    $gcdate,
-                );
-                 $body[] = $d;
             }
         }
         $file = Dever::input('excel_name');