Your Name 2 years ago
parent
commit
5c1f3c9877

+ 7 - 6
service/agent/database/member.php

@@ -99,12 +99,13 @@ $level = function()
 };
 $excel = false;
 if (Dever::load('manage/auth')->checkFunc('agent.member', 'agent_member_excel1', '代理商数据导出')) {
-    $excel = array
-    (
-        array('代理商数据导出', '代理商列表', 'agent/lib/manage.agentOut'),
-        array('代理商资金数据导出', '代理商资金列表', 'agent/lib/manage.agentCashOut'),
-        array('背调直推奖励', '背调直推奖励', 'agent/lib/manage.out_zhitui'),
-    );
+    $excel[] = array('代理商数据导出', '代理商列表', 'agent/lib/manage.agentOut');
+}
+if (Dever::load('manage/auth')->checkFunc('agent.member', 'agent_member_excel12', '代理商资金数据导出')) {
+    $excel[] = array('代理商资金数据导出', '代理商资金列表', 'agent/lib/manage.agentCashOut');
+}
+if (Dever::load('manage/auth')->checkFunc('agent.member', 'agent_member_excel13', '代理商直推奖励导出')) {
+    $excel[] = array('代理商直推奖励导出', '代理商直推奖励列表', 'agent/lib/manage.out_zhitui');
 }
 
 # 权限设置 1是查看详情、2是头衔统计

+ 1 - 1
service/agent/database/order.php

@@ -127,7 +127,7 @@ if ($pmid) {
         $excel[] = array('数据导出', '代理商订单','agent/lib/order.out_order');
     } 
     if(Dever::load('manage/auth')->checkFunc('agent.order', 'editbeidiao', '背调订单记录数据导出')){
-        $excel[] = array('背调订单记录', '背调订单记录','agent/lib/order.out_beidiaoorder');
+        $excel[] = array('代理商订单导出', '代理商订单记录','agent/lib/order.out_beidiaoorder');
     } 
 }
 # 权限设置 1是查看详情、2是城市数据统计

+ 16 - 3
service/agent/lib/Manage.php

@@ -1080,8 +1080,21 @@ class Manage
         foreach($data as $k => $v){
             if($v['parent_mid']>0){
                 $member = Dever::db('agent/member')->find($v['parent_mid']);
-                $prole = Dever::db('setting/role')->find($member['role']);
-                $role = Dever::db('setting/role') ->find($v['role']);
+                $prole_name = '';
+                if($member && $member['role']){
+                    $prole = Dever::db('setting/role')->find($member['role']);
+                    if($prole && $prole['name']){
+                        $prole_name = $prole['name'];
+                    }
+                }
+                $role_name = '';
+                if($v['role']){
+                    $role = Dever::db('setting/role') ->find($v['role']);
+                    if($role && $role['name']){
+                        $role_name = $role['name'];
+                    }
+                }
+                
                 $order = Dever::db('agent/order')->find(array('mid'=>$v['id']));
                 $cdate = '';
                 if($v['cdate']){
@@ -1092,7 +1105,7 @@ class Manage
                     $member['name'],
                     $member['mobile'],
                     $member['idcard'],
-                    $prole['name'],
+                    $prole_name,
                     $v['name'],
                     $v['mobile'],
                     $v['idcard'],

+ 9 - 2
service/agent/lib/Order.php

@@ -1743,14 +1743,21 @@ class Order
             if($v['cdate']){
                 $cdate = date('Y-m-d H:i',$v['cdate']);
             }
-            $role = Dever::db('setting/role')->find($v['role']);
+            $role_name = '';
+            if($v['role']){
+                $role = Dever::db('setting/role')->find($v['role']);
+                if($role && $role['name']){
+                    $role_name = $role['name'];
+                }
+            }
+            
             $d = array
             (
                 $v['name'],
                 $v['mobile'],
                 $v['idcard'],
                 $cdate,
-                $role['name'],
+                $role_name,
                 $v['agent_cash'],
             );
             $body[] = $d;