edit

service/agent/lib/Dhorder.php

@@ -1163,18 +1163,16 @@ class Dhorder
     public function out_dhorder_api(){
         $start = Dever::input('search_option_start_cdate');
         $end = Dever::input('search_option_end_cdate');
+        $where = array();
+        $where['state'] = 1;
         if($start){
-            $starts=strtotime($start);
+            $where['start']=strtotime($start);
         }
         if($end){
-            $ends=strtotime($end);
+            $where['end']=strtotime($end);
         }
         $header = array('订单编号', '会员姓名', '会员等级', '会员手机号', '收货姓名(或自提人)', '联系电话', '收货地址', '商品名称', '商品规格', '商品数量', '商品原价','订单状态','下单时间', '付款时间','完成时间','卖家订单备注','权益发放时间','代理商终审时间');
-        if(isset($starts) &&  $starts && isset($ends) && $ends){
-            $data = Dever::db('agent/dh_order')->getExcelAll(array('start'=>$starts,'end'=>$ends,'state'=>1));
-        }else{
-            $data = Dever::db('agent/dh_order')->getExcelAll(array('state'=>1));
-        }
+        $data = Dever::db('agent/dh_order')->getExcelAll($where);
         $body = array();
         foreach($data as $k => $v){
             $member = Dever::db('agent/member')->find(array('id'=>$v['mid']));
@@ -1234,11 +1232,10 @@ class Dhorder
     #权益管理导出
     public function out_member_goods_api(){
         $status = Dever::input('search_option_status');
-        if( $status){
-            $data = Dever::db('agent/member_goods')->getExcelAll(array('status'=>$status,'state'=>1));
-        }else{
-            $data = Dever::db('agent/member_goods')->getExcelAll(array('state'=>1));
-        }
+        $where = array();
+        $where['state'] = 1;
+        $where['status'] = $status;
+        $data = Dever::db('agent/member_goods')->getExcelAll($where);
         $header = array('权益名称', '会员等级', '姓名', '手机号', '获取方式', '获取时间');
         $body = array();
         foreach($data as $k => $v){

service/agent/lib/Order.php

@@ -1400,36 +1400,25 @@ class Order
         $end = Dever::input('search_option_end_cdate');
         $fstart = Dever::input('search_option_start_fdate');
         $fend = Dever::input('search_option_end_fdate');
+        $where = array();
+        $where['state'] = 1;
         if($start){
-            $starts=strtotime($start);
+            $where['start'] = strtotime($start);
         }
         if($end){
-            $ends=strtotime($end);
+            $where['end'] = strtotime($end);
         }
         if($fstart){
-            $fstarts=strtotime($fstart);
+            $where['fstart'] = strtotime($fstart);
         }
         if($fend){
-            $fends=strtotime($fend);
+            $where['fend'] = strtotime($fend);
         }
+        $where['status'] = $status;
         $header = array('邀请码', '姓名', '手机号', '身份证号', '会员角色', '代理商区域', '注册金额', '代理费', '直推业绩', '团队业绩', '申请类型','公司名称','申请时间', '初审时间','初审人','终审时间','终审人','审核状态','分润发放时间','分润发放人','权益发放时间','权益发放人','驳回原因','驳回时间','驳回人','管理员备注','推荐人姓名','推荐人电话','推荐人等级','推荐人代理地区');
-        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{
-            $data = Dever::db('agent/order')->getExcelAll(array('state'=>1));
-        }
+
+        $data = Dever::db('agent/order')->getExcelAll($where);
+        
         $body = array();
         foreach($data as $k => $v){
             $config = Dever::db('agent/order')->config['set'];

service/bill/lib/Cash.php

@@ -258,22 +258,18 @@ class Cash
     }
     #钱包管理数据导出
     public function out_cash_api(){
-        // $status = Dever::input('search_option_status');
-        // $type = Dever::input('search_option_type');
         $start = Dever::input('search_option_start_cdate');
         $end = Dever::input('search_option_end_cdate');
+        $where = array();
+        $where['state'] = 1;
         if($start){
-            $starts=strtotime($start);
+            $where['start']=strtotime($start);
         }
         if($end){
-            $ends=strtotime($end);
+            $where['end']=strtotime($end);
         }
         $header = array('邀请码', '姓名', '手机号', '身份证号', '代理角色', '代理商区域', '代理费', '审核时间', '直推收入', '团队收入', '管理员备注');
-       if(isset($starts) &&  $starts && isset($ends) && $ends){
-            $data = Dever::db('bill/cash')->getExcelAll(array('start'=>$starts,'end'=>$ends,'state'=>1));
-        }else{
-            $data = Dever::db('bill/cash')->getExcelAll(array('state'=>1));
-        }
+       $data = Dever::db('bill/cash')->getExcelAll($where);
         $body = array();
         foreach($data as $k =>$v){
             $arr[] = Dever::db('agent/member')->find(array('id'=>$v['mid']));