edit

service/agent/database/order.php

@@ -913,6 +913,8 @@ return array
             (
                 'start' => array('yes-cdate', '>='),
                 'end' => array('yes-cdate', '<='),
+                'fstart' => array('yes-fdate', '>='),
+                'fend' => array('yes-fdate', '<='),
                 'status' => array('yes', 'in'),
                 'state' => 1,
             ),

service/agent/lib/Order.php

@@ -1264,17 +1264,33 @@ class Order
         $status = Dever::input('search_option_status');
         $start = Dever::input('search_option_start_cdate');
         $end = Dever::input('search_option_end_cdate');
+        $fstart = Dever::input('search_option_start_fdate');
+        $fend = Dever::input('search_option_end_fdate');
         if($start){
             $starts=strtotime($start);
         }
         if($end){
             $ends=strtotime($end);
         }
+        if($fstart){
+            $fstarts=strtotime($fstart);
+        }
+        if($fend){
+            $fends=strtotime($fend);
+        }
         $header = array('邀请码', '姓名', '手机号', '身份证号', '会员角色', '代理商区域', '注册金额', '代理费', '直推业绩', '团队业绩', '申请类型','公司名称','申请时间', '初审时间','初审人','终审时间','终审人','审核状态','分润发放时间','分润发放人','权益发放时间','权益发放人','驳回原因','驳回时间','驳回人','管理员备注','推荐人姓名','推荐人电话','推荐人等级','推荐人代理地区');
-        if($status && isset($starts) &&  $starts && isset($ends) && $ends){
-            $data = Dever::db('agent/order')->getExcelAll(array('start'=>$starts,'end'=>$ends,'status'=>$status,'state'=>1));
+        if($status && isset($starts) &&  $starts && isset($ends) && $ends && isset($fstarts) &&  $fstarts && isset($fends) && $fends){
+            $data = Dever::db('agent/order')->getExcelAll(array('start'=>$starts,'end'=>$ends,'fstart'=>$fstarts,'fend'=>$fends,'status'=>$status,'state'=>1));
+        }elseif(isset($starts) && $starts && isset($ends) && $ends && isset($fstarts) &&  $fstarts && isset($fends) && $fends){
+            $data = Dever::db('agent/order')->getExcelAll(array('start'=>$starts,'end'=>$ends,'fstart'=>$fstarts,'fend'=>$fends,'state'=>1));
         }elseif(isset($starts) && $starts && isset($ends) && $ends){
             $data = Dever::db('agent/order')->getExcelAll(array('start'=>$starts,'end'=>$ends,'state'=>1));
+        }elseif(isset($fstarts) &&  $fstarts && isset($fends) && $fends){
+            $data = Dever::db('agent/order')->getExcelAll(array('fstart'=>$fstarts,'fend'=>$fends,'state'=>1));
+        }elseif(isset($starts) && $starts && isset($ends) && $ends && $status){
+            $data = Dever::db('agent/order')->getExcelAll(array('start'=>$starts,'end'=>$ends,'status'=>$status,'state'=>1));
+        }elseif(isset($fstarts) &&  $fstarts && isset($fends) && $fends && $status){
+            $data = Dever::db('agent/order')->getExcelAll(array('fstart'=>$fstarts,'fend'=>$fends,'status'=>$status,'state'=>1));
         }elseif($status){
             $data = Dever::db('agent/order')->getExcelAll(array('status'=>$status,'state'=>1));
         }else{
@@ -1283,6 +1299,7 @@ class Order
         $body = array();
         foreach($data as $k => $v){
             $member = Dever::db('agent/member')->find(array('id'=>$v['mid']));
+            $code = Dever::load("invite/api.code", $member['id']);
             if($member['type'] == 1){
                 $member_type = '个人';
             }else{
@@ -1340,7 +1357,7 @@ class Order
             }
             $d = array
             (
-                $member['code'],
+                $code,
                 $member['name'],
                 $member['mobile'],
                 $member['idcard'],

service/bill/lib/Cash.php

@@ -289,12 +289,13 @@ class Cash
         $body = array();
         foreach($data as $k =>$v){
             $member = Dever::db('agent/member')->find(array('id'=>$v['mid']));
+            $code = Dever::load("invite/api.code", $member['id']);
             $role = Dever::db('setting/role')->find(array('id'=>$member['role']));
             $area = Dever::load("area/api.string", $member['area']);
             $order = Dever::db('agent/order')->find(array('mid'=>$v['mid']));
             $d = array
             (
-                $member['code'],
+                $code,
                 $member['name'],
                 $member['mobile'],
                 $role['name'],