Your Name 2 years ago
parent
commit
71d6214086
3 changed files with 99 additions and 25 deletions
  1. 42 8
      service/agent/database/member.php
  2. 41 17
      service/agent/database/order.php
  3. 16 0
      service/agent/lib/Member.php

+ 42 - 8
service/agent/database/member.php

@@ -97,11 +97,15 @@ $level = function()
     }
     return $array;
 };
-
+# 权限设置 1是查看详情、2是头衔统计
+$search_auth = Dever::input('search_option_dever_auth', 1);
 $info = '';
 $button = array();
 $list_button = array();
-$list_button['list'] = array('查看详情', '"member_area&mid={id}&page_type=1&[refer]"');
+if($search_auth == 1){
+    $list_button['list'] = array('查看详情', '"member_area&mid={id}&page_type=1&[refer]"');
+}
+
 /*
 if (Dever::load('manage/auth')->checkFunc('agent.member', 'edit6', '查看关系图谱')) {
     $list_button['list1'] = array('查看关系图谱',Dever::url('lib/manage.relation?mid={id}&[refer].manage', 'agent'));
@@ -145,7 +149,7 @@ return array
                 'search' => 'id',
             ),
             'list_name' => '代理商信息',
-            'list'      => 'Dever::load("agent/lib/member.getOne", {id}, "agent/member", true)',
+            'list'      => $search_auth == 1 ? 'Dever::load("agent/lib/member.getOne", {id}, "agent/member", true)' : false,
         ),
 
         'name'      => array
@@ -156,6 +160,8 @@ return array
             'desc'      => '姓名',
             'match'     => 'is_string',
             'update'    => 'text',
+            'list_name' => $search_auth == 2 ? '姓名': false,
+            'list'      => $search_auth == 2 ? true : false,
         ),
 
         'rdate'     => array
@@ -168,7 +174,7 @@ return array
             'update'    => 'date',
             'callback'  => 'maketime',
             // 'list'        => '{rdate} > 0 ? date("Y-m-d H:i", {rdate}) : "无"',
-            'list'      => 'Dever::load("agent/lib/member.set_rdate", {id})',
+            'list'      => $search_auth == 1 ? 'Dever::load("agent/lib/member.set_rdate", {id})' : false,
             'list_order' => 100,
         ),
 
@@ -193,7 +199,7 @@ return array
             'match'     => Dever::rule('mobile'),
             'update'    => 'hidden',
             //'search'    => 'fulltext',
-            //'list'      => true,
+            'list'      => $search_auth == 2 ? true : false,
         ),
 
         'email'     => array
@@ -254,7 +260,7 @@ return array
                 'search' => 'parent_mid',
             ),
             'list_name' => '上级信息',
-            'list'      => 'Dever::load("agent/lib/member.getOne", {parent_mid})',
+            'list'      => $search_auth == 1 ? 'Dever::load("agent/lib/member.getOne", {parent_mid})' : false,
         ),
 
         'source_id'      => array
@@ -290,6 +296,7 @@ return array
             'search'    => 'select',
             'update'    => 'select',
             'option'    => $role,
+            'list'      => $search_auth == 2 ? true : false,
         ),
 
         'level_id'      => array
@@ -315,6 +322,7 @@ return array
             'search'    => 'select',
             'update'    => 'radio',
             'option'    => $title,
+            'list'      => $search_auth == 2 ? true : false,
         ),
 
         'is_area'        => array
@@ -475,7 +483,7 @@ return array
             'match'     => 'is_numeric',
             'update'    => 'text',
             'list_name' => '余额<br />直推业绩<br />团队业绩',
-            'list'      => '"{cash}<br />{sell}<br />{group_sell}"',
+            'list'      => $search_auth == 1 ?'"{cash}<br />{sell}<br />{group_sell}"' : false,
         ),
 
         'sell'      => array
@@ -486,6 +494,7 @@ return array
             'desc'      => '销售业绩',
             'match'     => 'is_numeric',
             'update'    => 'text',
+            'list'      => $search_auth == 2 ? true : false,
         ),
 
         'group_sell'      => array
@@ -496,6 +505,7 @@ return array
             'desc'      => '团队销售业绩',
             'match'     => 'is_numeric',
             'update'    => 'text',
+            'list'      => $search_auth == 2 ? true : false,
         ),
 
         'old_group_sell'      => array
@@ -506,6 +516,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_money",{id})': false,
         ),
 
         'old_agentdownnum'      => array
@@ -547,7 +559,7 @@ return array
             'match'     => 'is_numeric',
             'option'    => $status,
             'search'    => 'select',
-            'list'      => true,
+            'list'      => $search_auth == 1 ? true : false,
         ),
 
         'import'        => array
@@ -571,6 +583,15 @@ return array
             'option'    => $prize_type,
         ),
 
+        'dever_auth'      => array
+        (
+            'name'      => '权限',
+            'default'   => '',
+            'desc'      => '类型',
+            'match'     => 'is_string',
+            'search'    => 'hidden',
+        ),
+
         'reorder'       => array
         (
             'type'      => 'int-11',
@@ -836,5 +857,18 @@ return array
             'type' => 'all',
             'col' => 'id,name,mobile,idcard,role,group_sell',
         ),
+
+        'getNewParent' => array
+        (
+            # 匹配的正则或函数 选填项
+            'option' => array
+            (
+                'parent_mid' => 'yes',
+                
+                'state' => 1,
+            ),
+            'type' => 'all',
+            'col' => 'id,sell',
+        ),
     ),
 );

+ 41 - 17
service/agent/database/order.php

@@ -130,6 +130,12 @@ if ($pmid) {
     }
     
 }
+# 权限设置 1是查看详情、2是城市数据统计
+$search_auth = Dever::input('search_option_dever_auth', 1);
+$list_button = array();
+if($search_auth == 1){
+    $list_button['list'] = array('查看详情', '"order_process&project=agent&order_id={id}&page_type=1&[refer]"');
+}
 
 
 $invite_type = array
@@ -191,7 +197,7 @@ return array
                 'search' => 'mid',
             ),
             'list_name' => '代理商信息',
-            'list'      => 'Dever::load("agent/lib/member.getOne", {mid}, "agent/member", true)',
+            'list'      => $search_auth == 1 ? 'Dever::load("agent/lib/member.getOne", {mid}, "agent/member", true)' : false,
             'list_order' => 3,
         ),
 
@@ -227,7 +233,8 @@ return array
             'match'     => Dever::rule('mobile'),
             'update'    => 'text',
             //'search'    => 'fulltext',
-            //'list'      => true,
+            'list'      => $search_auth == 2 ? true : false,
+            'list_order' => 2,
         ),
 
         'invite_type'      => array
@@ -274,7 +281,7 @@ return array
                 'search' => 'parent_mid',
             ),
             'list_name' => '上级信息',
-            'list'      => 'Dever::load("agent/lib/member.getOne", {parent_mid})',
+            'list'      => $search_auth == 1 ? 'Dever::load("agent/lib/member.getOne", {parent_mid})' : false,
         ),
 
         'source_id'      => array
@@ -301,6 +308,8 @@ return array
             'match'     => 'is_string',
             'update'    => 'text',
             //'search'    => 'fulltext',
+            'list'      => $search_auth == 2 ? true : false,
+            'list_order' => 1,
         ),
 
         'role'      => array
@@ -313,6 +322,8 @@ return array
             'search'    => 'select',
             'update'    => 'select',
             'option'    => $role,
+            'list'      => $search_auth == 2 ? true : false,
+            'list_order' => 3,
         ),
 
         'area'       => array
@@ -325,6 +336,8 @@ return array
             'search'    => 'linkage',
             'update'    => 'linkage',
             'option'    => Dever::url('api.get?level_total=4', 'area'),
+            'list'      => $search_auth == 2 ? 'Dever::load("area/api.string", {area})' : false,
+            'list_order' => 3,
         ),
 
         'desc'      => array
@@ -357,10 +370,10 @@ return array
             'update'    => 'text',
             // 'list'		=> true,
             //'list_name' => '应付金额<br />实付金额<br />代理费<br />软件服务费<br />',
-            'list_name' => '实付金额',
+            'list_name' => $search_auth == 1 ? '实付金额' : '总销售额',
             'list'      => true,
-            //'list'      =>'Dever::load("agent/lib/order.set_price", {id})',
-            'list_order' => 10,
+            // 'list'      =>'Dever::load("agent/lib/order.set_price", {id})',
+            'list_order' => 100,
         ),
 
         'pay_type'		=> array
@@ -562,7 +575,7 @@ return array
             'match'     => 'is_numeric',
             'option'    => $status,
             'search'    => 'select',
-            'list'      => true,
+            'list'      => $search_auth == 1 ? true : false,
             'list_order' => 8,
         ),
 
@@ -585,7 +598,7 @@ return array
             'match'     => 'is_numeric',
             'option'    => $goods_status,
             'search'    => 'select',
-            'list'      => true,
+            'list'      => $search_auth == 1 ? true : false,
             'list_order' => 9,
         ),
 
@@ -618,6 +631,7 @@ return array
             'desc'      => '代理费',
             'match'     => 'option',
             'update'    => 'text',
+            'list'      => $search_auth == 2 ? true : false,
         ),
 
         'soft_cash'      => array
@@ -628,6 +642,7 @@ return array
             'desc'      => '软件服务费',
             'match'     => 'option',
             'update'    => 'text',
+            'list'      => $search_auth == 2 ? '{soft_cash}' : false,
         ),
 
         'goods_cash'      => array
@@ -651,6 +666,15 @@ return array
             'update'    => 'radio',
         ),
 
+        'dever_auth'      => array
+        (
+            'name'      => '权限',
+            'default'   => '',
+            'desc'      => '类型',
+            'match'     => 'is_string',
+            'search'    => 'hidden',
+        ),
+
         'state'     => array
         (
             'type'      => 'tinyint-1',
@@ -692,7 +716,7 @@ return array
             'search'    => 'date',
             // 'list'      => 'date("Y-m-d H:i:s", {cdate})',
             'list_name' => '注册时间<br />初审时间<br />终审时间<br />完成时间<br />',
-            'list'      => 'Dever::load("agent/lib/order.set_cdate", {id})',
+            'list'      => $search_auth == 1 ? 'Dever::load("agent/lib/order.set_cdate", {id})' : false,
             'list_order' => 200,
         ),
     ),
@@ -722,14 +746,14 @@ return array
         'delete' => false,
         'edit' => false,
         'button' => $button,
-        'list_button' => array
-        (
-            //fast_list
-            'list' => array('查看详情', '"order_process&project=agent&order_id={id}&page_type=1&[refer]"'),
-
-            //'edit' => array('退款', 'status,tk_time,tk_pic,tk_desc,tk_admin,tk_status', '{status} == 6'),
-            //'delete' => array('删除', '', '{status} == 1'),
-        ),
+        'list_button' => $list_button,
+        // (
+        //     //fast_list
+        //     'list' => array('查看详情', '"order_process&project=agent&order_id={id}&page_type=1&[refer]"'),
+
+        //     //'edit' => array('退款', 'status,tk_time,tk_pic,tk_desc,tk_admin,tk_status', '{status} == 6'),
+        //     //'delete' => array('删除', '', '{status} == 1'),
+        // ),
     ),
 
     'request' => array

+ 16 - 0
service/agent/lib/Member.php

@@ -655,4 +655,20 @@ class Member
             return '';
         }
     }
+    #新增业绩(去掉直推最大一组市场,其他小组市场新增业绩之和)
+    public function new_money($id){
+        $info = Dever::db('agent/member')->getNewParent(array('parent_mid'=>$id,'state'=>1));
+        $temp = array();
+        $sell = 0;
+        foreach ($info as $key => $val) {
+            $temp[] = $val['sell']; // 用一个空数组来承接字段
+            $sell += $val['sell'];
+        }
+        if($temp){
+             $total = $sell - max($temp);
+        }else{
+            $total = $sell;
+        }
+        return $total;
+    }
 }