edit

service/agent/database/member.php

@@ -97,6 +97,10 @@ if (Dever::load('manage/auth')->checkFunc('agent.member', 'agent_member_excel13'
     $excel[] = array('代理商直推奖励导出', '代理商直推奖励列表', 'agent/lib/manage.out_zhitui');
 }
 
+if (Dever::load('manage/auth')->checkFunc('agent.member', 'agent_member_excel14', '代理商归店数据导出')) {
+    $excel[] = array('代理商归店数据导出', '代理商列表', 'agent/lib/manage.agentGuiout');
+}
+
 
 # 权限设置 1是查看详情、2是头衔统计
 $search_auth = Dever::input('search_option_dever_auth', 1);

service/agent/lib/Manage.php

@@ -31,6 +31,96 @@ class Manage
         
         return 'reload';
     }
+    #代理商归店直推数据导出
+    public function agentGuiout($data)
+    {
+        $file = Dever::input('excel_name');
+        $header = array('姓名', '手机号', '所属店铺', '代理角色', '代理商区域', '代理费', '余额', '直推业绩', '团队业绩', '注册时间', '注册完成时间', '推荐人', '推荐人电话', '推荐人代理角色');
+        
+        $body = array();
+
+        if ($data) {
+            foreach ($data as $k => $v) {
+                $shop_name = '';
+                if ($v['shop_id'] && $v['shop_id'] > 0) {
+                    $shop = Dever::db('shop/info')->find($v['shop_id']);
+                    if ($shop) {
+                        $shop_name = $shop['name'];
+                    }
+                }
+                $prize_type = '';
+                if (is_array($v)) {
+                    if ($v['role']) {
+                        $role = Dever::db('setting/role')->find($v['role']);
+                        if($v['role'] == 8){
+                            if($v['prize_type'] == 1){
+                                $prize_type = '-名额外';
+                            }elseif($v['prize_type'] == 2){
+                                $prize_type = '-名额内';
+                            }
+                        }
+                    } else {
+                        $role = array('name' => '普通代理',);
+                    }
+
+                    $order = Dever::db('agent/order')->find(array('mid' => $v['id']));
+                    $agent_cash = 0;
+                    if ($order) {
+                        $agent_cash = $order['agent_cash'];
+                    }
+                    
+                    $area = Dever::load("area/api.string", $v['area']);
+                    if ($v['rdate']) {
+                        $rdate = date('Y-m-d H:i',$v['rdate']);
+                    } else {
+                        $rdate = '-';
+                    }
+                    $parent_name = '';
+                    $parent_mobile = '';
+                    $parent_rolename = '';
+
+                    if ($v['parent_mid'] && $v['parent_mid'] > 0) {
+                        $parent = Dever::db('agent/member')->find(array('id'=>$v['parent_mid']));
+                        if ($parent) {
+                            if($parent['role']){
+                                $parent_role = Dever::db('setting/role')->find(array('id'=>$parent['role']));
+                                if($parent_role){
+                                    $parent_rolename = $parent_role['name'];
+                                }
+                            }
+                            if($parent['name']){
+                                $parent_name = $parent['name'];
+                            }
+                            if($parent['mobile']){
+                                $parent_mobile = $parent['mobile'];
+                            }
+                        }
+                    }
+                    
+                    $d = array
+                    (
+                        $v['name'],
+                        $v['mobile'],
+                        $shop_name,
+                        $role['name'].$prize_type,
+                        $area,
+                        $agent_cash,
+                        $v['cash'],
+                        $v['sell'],
+                        $v['group_sell'],
+                        date('Y-m-d H:i',$v['cdate']),
+                        $rdate,
+                        $parent_name,
+                        $parent_mobile,
+                        $parent_rolename,
+                    );
+                    $body[] = $d;
+                }
+            }
+        }
+
+        return Dever::excelExport($body, $header, $file);
+    }
 
     public function agentOut($data)
     {

tool/clue/database/info.php

@@ -640,6 +640,8 @@ return array
                 'follow_group_id' =>'yes',
                 'gstart' => array('yes-gdate','>='),
                 'gend' => array('yes-gdate','<='),
+                'fstart' => array('yes-fdate','>='),
+                'fend' => array('yes-fdate','<='),
                 'type' =>array('yes','in'),
                 'state' => 1,
             ),

tool/clue/lib/Cron.php

@@ -30,14 +30,18 @@ Class Cron
         	$where['d_num'] = Dever::db('clue/info')->getHAll($w);
         	$w['type'] = 2;
         	$where['dg_num'] = Dever::db('clue/info')->getHAll($w);
-        	$w['type'] = 3;
-        	$w['gstart'] = $start;
-        	$w['gend'] = $end;
+        	$wh['type'] = 3;
+        	$wh['gstart'] = $start;
+        	$wh['gend'] = $end;
+        	$wh['follow_group_id'] = $v['group_id'];
         	$where['g_num'] = Dever::db('clue/info')->getHAll($w);
-        	$w['type'] = 5;
-        	$where['qx_num'] = Dever::db('clue/info')->getHAll($w);
-        	$w['type'] = 4;
-        	$where['f_num'] = Dever::db('clue/info')->getHAll($w);
+        	$w1['follow_group_id'] = $v['group_id'];
+        	$w1['fstart'] = $start;
+        	$w1['fend'] = $end;
+        	$w1['type'] = 5;
+        	$where['qx_num'] = Dever::db('clue/info')->getHAll($w1);
+        	$w1['type'] = 4;
+        	$where['f_num'] = Dever::db('clue/info')->getHAll($w1);
         	$res = Dever::db('clue/info_stat')->find(array('group_id'=>$v['group_id'],'day'=>$start,'clear'=>true));
         	$where['clear'] = true;
         	if ($res) {