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

service/agent/lib/Member.php

@@ -814,6 +814,14 @@ class Member
         if($member){
             unset($member[0]);
         }
+        if ($member) {
+            foreach ($member as $k => $v) {
+                if ($v['group_sell'] >=5000000) {
+                    unset($member[$k]);
+                }
+            }
+        }
+        // print_R($member);die;
         $where = array();
         if($start){
             $where['start'] = $start;
@@ -821,21 +829,23 @@ class Member
         if($end){
             $where['end'] = $end;
         }
+        $total = sprintf ('%01.2f',0);
         $where['state'] = 1;
         $where['type'] = 2;
         $where['stype'] = 1;
-        $array = array_column($member, 'id');
-        foreach($array as $k=>$v){
-            $where['mid'] = $v;
-            $info[] = Dever::db('bill/sell')->getNewChildParent($where);
-        }
-        if(isset($info) && $info){
-            foreach($info as $k => $v){
-                $total += $v['total'];
+        if ($member) {
+            $array = array_column($member, 'id');
+            foreach($array as $k=>$v){
+                $where['mid'] = $v;
+                $info[] = Dever::db('bill/sell')->getNewChildParent($where);
+            }
+            if(isset($info) && $info){
+                foreach($info as $k => $v){
+                    $total += $v['total'];
+                }
             }
+            $total = sprintf ('%01.2f',$total);
         }
-        $total = sprintf ('%01.2f',$total);
-        
         return $total;
     }
     #新增正常业绩