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

service/agent/database/member.php

@@ -976,6 +976,22 @@ return array
             'col' => 'id,group_sell,sell',
         ),
 
+        'getNewMember' => array
+        (
+            # 匹配的正则或函数 选填项
+            'option' => array
+            (
+                'start' => array('yes-rdate','>='),
+                'end' => array('yes-rdate','<='),
+                'parent_mid' => 'yes',
+                'state' => 1,
+            ),
+            'type' => 'all',
+            'order' => array('group_sell'=>'desc'),
+            'col' => 'id,group_sell,sell',
+        ),
+
+
         'getDataByArea' => array
         (
             # 匹配的正则或函数 选填项

service/agent/lib/Member.php

@@ -719,30 +719,30 @@ class Member
             $where['end'] = $end;
         }
         $where['mid'] = $id;
+        $where['parent_mid'] = $id;
         $where['state'] = 1;
         $where['type'] = 2;
         $where['stype'] = 1;
-        $info = Dever::db('bill/sell')->getNewChildParent($where);
+        // $info = Dever::db('bill/sell')->getNewChildParent($where);
+        $member = Dever::db('agent/member')->getNewMember($where);
         $temp = array();
         $sell = 0;
-        $max = count($info);
-        if ($max > 0) {
-            foreach ($info as $key => $val) {
-                $temp[] = $val['total']; // 用一个空数组来承接字段
-                $sell += $val['total'];
+        $total = 0;
+        if($member){
+            unset($member[0]);
+        }
+        $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($temp){
-                $total = sprintf ('%01.2f',$sell - max($temp));
-            }else{
-                $total = sprintf ('%01.2f',$sell);
-            }
-        } else {
-            $total = 0;
-            foreach ($info as $key => $val) {
-                $total += $val['total'];
-            }
-            $total = sprintf ('%01.2f',$total);
         }
+        $total = sprintf ('%01.2f',$total);
+        
         return $total;
     }
     #新增正常业绩

service/bill/database/sell.php

@@ -329,9 +329,26 @@ return array
                 'stype' => 'yes',
                 'state' => 1,
             ),
-            'group' => 'child_mid',
-            'type' => 'all',
-            'col' => 'child_mid,sum(num) as total|child_mid',
+            // 'group' => 'child_mid',
+            'type' => 'one',
+            'col' => 'child_mid,sum(num) as total',
+        ),
+
+        'childOne' => array
+        (
+            # 匹配的正则或函数 选填项
+            'option' => array
+            (
+                'start' => array('yes-cdate','>='),
+                'end' => array('yes-cdate','<='),
+                'mid' => 'yes',
+                'type' => 'yes',
+                'stype' => 'yes',
+                'state' => 1,
+            ),
+            // 'group' => 'child_mid',
+            'type' => 'one',
+            'col' => 'child_mid,max(num) as total',
         ),
 
         'getChildData' => array