edit

service/agent/database/member.php

@@ -173,7 +173,7 @@ return array
             'desc'      => '',
             'update'    => 'date',
             'callback'  => 'maketime',
-            'search'    => $search_auth == 2 ? 'date' : false,
+            // 'search'    => $search_auth == 2 ? 'date' : false,
             // 'list'        => '{rdate} > 0 ? date("Y-m-d H:i", {rdate}) : "无"',
             'list'      => $search_auth == 1 ? 'Dever::load("agent/lib/member.set_rdate", {id})' : false,
             'list_order' => 100,
@@ -495,7 +495,7 @@ return array
             'desc'      => '销售业绩',
             'match'     => 'is_numeric',
             'update'    => 'text',
-            'list'      => $search_auth == 2 ? true : false,
+            'list'      => $search_auth == 2 ? 'Dever::load("agent/lib/member.new_sell",{id})' : false,
         ),
 
         'group_sell'      => array
@@ -506,7 +506,7 @@ return array
             'desc'      => '团队销售业绩',
             'match'     => 'is_numeric',
             'update'    => 'text',
-            'list'      => $search_auth == 2 ? true : false,
+            'list'      => $search_auth == 2 ? 'Dever::load("agent/lib/member.new_groupsell",{id})' : false,
         ),
 
         'old_group_sell'      => array
@@ -529,6 +529,8 @@ return array
             'desc'      => '历史团队业绩',
             'match'     => 'is_numeric',
             'update'    => 'text',
+            'list_name' => $search_auth == 2 ? '新增正常业绩' : false,
+            'list'      => $search_auth == 2 ? 'Dever::load("agent/lib/member.new_zmoney",{id})': false,
         ),
 
         'old_pwd'      => array
@@ -586,11 +588,22 @@ return array
 
         'dever_auth'      => array
         (
-            'name'      => '权限',
+            'name'      => '业绩时间',
             'default'   => '',
             'desc'      => '类型',
             'match'     => 'is_string',
             'search'    => 'hidden',
+            
+        ),
+
+        'dever_time'      => array
+        (
+            'name'      => '业绩时间',
+            'default'   => '',
+            'desc'      => '类型',
+            'match'     => 'is_string',
+            // 'search'    => 'hidden',
+            'search'    => $search_auth == 2 ? 'date' : false,
         ),
 
         'reorder'       => array
@@ -622,7 +635,7 @@ return array
             'name'      => '加入日期',
             'match'     => array('is_numeric', time()),
             'desc'      => '',
-            'search'    => $search_auth == 2 ? 'date' : false,
+            // 'search'    => $search_auth == 2 ? 'date' : false,
             # 只有insert时才生效
             'insert'    => true,
             //'search'    => 'date',
@@ -867,12 +880,13 @@ return array
             # 匹配的正则或函数 选填项
             'option' => array
             (
+                'start' => array('yes-rdate','>='),
+                'end' => array('yes-rdate','<='),
                 'parent_mid' => 'yes',
-                
                 'state' => 1,
             ),
             'type' => 'all',
-            'col' => 'id,group_sell',
+            'col' => 'id,group_sell,sell',
         ),
 
         'getDataByArea' => array

service/agent/lib/Member.php

@@ -419,10 +419,13 @@ class Member
             );
         }
         // if (Dever::load('manage/auth')->checkFunc('agent.member','setmessage','发送短信')) {
+        //     $table = 'template';
+        //     $res = Dever::load('sms/api')->getTable($table);
         //     $button[2]['btn'][] = array
         //     (
         //         'type' => 'edit',
-        //         'link' => Dever::url('project/database/update?project=sms&table=template&search_option_state=1&search_option_type=daili_reg_yes,daili_reg_no,daili_goods_no,daili_tixian_yes,daili_tixian_no,daili_hetong_no&search_option_name='.$member['name'].'&search_option_mobile='.$member['mobile'], 'manage'),
+                
+        //         'link' => Dever::url($res.'&search_option_state=1&search_option_type=daili_reg_yes,daili_reg_no,daili_goods_no,daili_tixian_yes,daili_tixian_no,daili_hetong_no&search_option_name='.$member['name'].'&search_option_mobile='.$member['mobile'], 'manage'),
         //         'name' => '发送短信',
         //     );
         // }
@@ -668,7 +671,18 @@ class Member
     }
     #新增业绩（去掉直推最大一组市场，其他小组市场新增业绩之和）
     public function new_money_api($id){
-        $info = Dever::db('agent/member')->getNewParent(array('parent_mid'=>$id,'state'=>1));
+        $start = Dever::input('search_option_start_dever_time');
+        $end = Dever::input('search_option_end_dever_time');
+        $where = array();
+        if($start){
+            $where['start'] = $start;
+        }
+        if($end){
+            $where['end'] = $end;
+        }
+        $where['parent_mid'] = $id;
+        $where['state'] = 1;
+        $info = Dever::db('agent/member')->getNewParent($where);
         $temp = array();
         $sell = 0;
         foreach ($info as $key => $val) {
@@ -676,13 +690,79 @@ class Member
             $sell += $val['group_sell'];
         }
         if($temp && isset($info['title_id'])){
-            if($info['title_id'] == 4 || $info['title_id'] == 5){
+            // if($info['title_id'] == 4 || $info['title_id'] == 5){
                 $total = sprintf ('%01.2f',$sell - max($temp));
-            }
+            // }
             
         }else{
             $total = sprintf ('%01.2f',$sell);
         }
         return $total;
     }
+    #新增正常业绩
+    public function new_zmoney_api($id){
+        $start = Dever::input('search_option_start_dever_time');
+        $end = Dever::input('search_option_end_dever_time');
+        $where = array();
+        if($start){
+            $where['start'] = $start;
+        }
+        if($end){
+            $where['end'] = $end;
+        }
+        $where['parent_mid'] = $id;
+        $where['state'] = 1;
+        $info = Dever::db('agent/member')->getNewParent($where);
+        $sell = 0;
+        foreach ($info as $key => $val) {
+            $sell += $val['group_sell'];
+        }
+        $total = sprintf ('%01.2f',$sell);
+        return $total;
+    }
+    #直推业绩
+    public function new_sell($id){
+        $start = Dever::input('search_option_start_dever_time');
+        $end = Dever::input('search_option_end_dever_time');
+        // print_R($start);die;
+        $where = array();
+        if($start){
+            $where['start'] = $start;
+        }
+        if($end){
+            $where['end'] = $end;
+        }
+        $where['parent_mid'] = $id;
+        $where['state'] = 1;
+        // print_R($where);die;
+        $info = Dever::db('agent/member')->getNewParent($where);
+        $sell = 0;
+        foreach ($info as $key => $val) {
+            $sell += $val['sell'];
+        }
+        $total = sprintf ('%01.2f',$sell);
+        return $total;
+    }
+    #团队业绩
+    public function new_groupsell($id){
+        $start = Dever::input('search_option_start_dever_time');
+        $end = Dever::input('search_option_end_dever_time');
+        $where = array();
+        #agent/order;
+        if($start){
+            $where['start'] = $start;
+        }
+        if($end){
+            $where['end'] = $end;
+        }
+        $where['parent_mid'] = $id;
+        $where['state'] = 1;
+        $info = Dever::db('agent/member')->getNewParent($where);
+        $sell = 0;
+        foreach ($info as $key => $val) {
+            $sell += $val['group_sell'];
+        }
+        $total = sprintf ('%01.2f',$sell);
+        return $total;
+    }
 }