edit

service/agent/lib/Dhorder.php

@@ -1196,8 +1196,12 @@ class Dhorder
             if($v['fdate']){
                 $fdate = date('Y-m-d H:i',$v['fdate']);
             }
+            $quanyi = '';
             $member_goods = Dever::db('agent/member_goods')->getQone(array('type'=>$v['type'],'type_id'=>$v['type_id']));
-            $quanyi = date('Y-m-d H:i',$member_goods['cdate']);
+            if($member_goods['cdate']){
+                $quanyi = date('Y-m-d H:i',$member_goods['cdate']);
+            }
+            
             $goods_status = Dever::db('agent/dh_order')->config['status'];
             $status = Dever::status($goods_status, $v['status']);
             $d = array

service/bill/database/cash.php

@@ -374,8 +374,7 @@ return array
             (
                 'start' => array('yes-cdate', '>='),
                 'end' => array('yes-cdate', '<='),
-                'type' => array('yes', 'in'),
-                'status' => 'yes',
+                
                 'state' => 1,
             ),
             'type' => 'all',

service/bill/lib/Cash.php

@@ -258,8 +258,8 @@ class Cash
     }
     #钱包管理数据导出
     public function out_cash_api(){
-        $status = Dever::input('search_option_status');
-        $type = Dever::input('search_option_type');
+        // $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');
         if($start){
@@ -269,41 +269,63 @@ class Cash
             $ends=strtotime($end);
         }
         $header = array('邀请码', '姓名', '手机号', '身份证号', '代理角色', '代理商区域', '代理费', '审核时间', '直推收入', '团队收入', '管理员备注');
-        if(isset($starts) &&  $starts && isset($ends) && $ends && $status && $type){
-            $data = Dever::db('bill/cash')->getExcelAll(array('start'=>$starts,'end'=>$ends,'status'=>$status,'type'=>$type,'state'=>1));
-        }elseif(isset($starts) &&  $starts && isset($ends) && $ends && $status){
-            $data = Dever::db('bill/cash')->getExcelAll(array('start'=>$starts,'end'=>$ends,'status'=>$status,'state'=>1));
-        }elseif(isset($starts) &&  $starts && isset($ends) && $ends && $type){
-            $data = Dever::db('bill/cash')->getExcelAll(array('start'=>$starts,'end'=>$ends,'type'=>$type,'state'=>1));
-        }elseif(isset($starts) &&  $starts && isset($ends) && $ends){
+       if(isset($starts) &&  $starts && isset($ends) && $ends){
             $data = Dever::db('bill/cash')->getExcelAll(array('start'=>$starts,'end'=>$ends,'state'=>1));
-        }elseif($status && $type){
-            $data = Dever::db('bill/cash')->getExcelAll(array('status'=>$status,'type'=>$type,'state'=>1));
-        }elseif($status){
-            $data = Dever::db('bill/cash')->getExcelAll(array('status'=>$status,'state'=>1));
-        }elseif($type){
-            $data = Dever::db('bill/cash')->getExcelAll(array('type'=>$type,'state'=>1));
         }else{
             $data = Dever::db('bill/cash')->getExcelAll(array('state'=>1));
         }
         $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']));
+            $arr[] = Dever::db('agent/member')->find(array('id'=>$v['mid']));
+            foreach($arr as $k1=>$v1){
+                if($v['mid'] == $v1['id']){
+                    $arr[$k1]['operdate'] = $v['operdate'];
+                    $arr[$k1]['audit_desc'] = $v['audit_desc'];
+                }
+            }
+        }
+        $member = array();
+        $arr=array_unique($arr, SORT_REGULAR);
+        $rest=array();
+        foreach($arr as $k=>$v){
+            $rest[$v['id']]=$v;
+        }
+        $member=array_values($rest);
+        foreach($member as $k => $v){
+            $code = Dever::load("invite/api.code", $v['id']);
+            $role = Dever::db('setting/role')->find(array('id'=>$v['role']));
+            $area = Dever::load("area/api.string", $v['area']);
+            $order = Dever::db('agent/order')->state(array('mid'=>$v['id']));
+            $zhitui = Dever::db('bill/cash')->state(array('mid'=>$v['id'],'type'=>1));
+            $total = 0;
+            foreach($zhitui as $key => $val){
+                $total += $val['cash'];
+            }
+            $tuandui = Dever::db('bill/cash')->state(array('mid'=>$v['id'],'type'=>2));
+            $tuan = 0;
+            foreach($tuandui as $t){
+                $tuan += $t['cash'];
+            }
+            $sum = 0;
+            foreach($order as $k1 => $v1){
+                $sum += $v1['agent_cash']; 
+            }
+            $operdate = '';
+            if($v['operdate']){
+                $operdate = date('Y-m-d',$v['operdate']);
+            }
             $d = array
             (
                 $code,
-                $member['name'],
-                $member['mobile'],
+                $v['name'],
+                $v['mobile'],
+                $v['idcard'],
                 $role['name'],
                 $area,
-                $order['cash'],
-                date('Y-m-d',$v['operdate']),
-                $member['sell'],
-                $member['group_sell'],
+                $sum,
+                $operdate,
+                $total,
+                $tuan,
                 $v['audit_desc'],
             );
             $body[] = $d;