name

application/index/controller/Finance.php

@@ -323,7 +323,6 @@ class Finance extends Basic
                     $data['data']['total_income_money']  = 0;
                 }
             } else {
-                $fields .= ',e.role,e.agent_id';
                 $list_data  = $this->m_bargain->getBargainList(1, 50000, $order, $fields, $where);
 
                 if (!empty($list_data)) {
@@ -332,7 +331,6 @@ class Finance extends Basic
                     $trade_type_arr = [
                         10=>'出租 ',20=>'增佣',30=>'代理',40=>'好处费'
                     ];
-                    $redis = new RedisCacheService();
                     foreach ($list_data as $k=>$v) {
                         $excel_data[$k]['id'] = $v['id'];
                         $excel_data[$k]['create_time'] = $v['create_time'];
@@ -347,9 +345,13 @@ class Finance extends Basic
                         $excel_data[$k]['income_money'] = $m_real->sumField('money',['bargain_id'=>$v['id'], 'is_del'=>0]);
                         $excel_data[$k]['subtract'] = $v['commission'] - $excel_data[$k]['income_money'];
 
-                        if ($v['role'] == 3) {
-                            $agent_data = $redis->getRedisCache(2, $v['agent_id']);
-                            $excel_data[$k]['agent_name'] = $agent_data['name'];
+                        $agent_data = $this->m_bargain->agentBargainAll('b.name', ['a.id'=>$v['id'],'a.status'=>['<>', 30]]);
+                        if ($agent_data) {
+                            $name_string = '';
+                            foreach ($agent_data as $vv) {
+                                $name_string .= $vv['name'].',';
+                            }
+                            $excel_data[$k]['agent_name'] = rtrim($name_string, ',');
                         } else {
                             $excel_data[$k]['agent_name'] = '';
                         }

application/index/controller/OfficeBargain.php

@@ -302,7 +302,6 @@ class OfficeBargain extends Basic
                     $data['data']['total_income_money']  = 0;
                 }
             } else {
-                $fields .= ',e.role,e.agent_id';
                 $list_data  = $this->m_bargain->getBargainList(1, 50000, $order, $fields, $where);
 
                 if (!empty($list_data)) {
@@ -311,7 +310,6 @@ class OfficeBargain extends Basic
                     $trade_type_arr = [
                         10=>'出租 ',20=>'增佣',30=>'代理',40=>'好处费'
                     ];
-                    $redis = new RedisCacheService();
                     foreach ($list_data as $k=>$v) {
                         $excel_data[$k]['id'] = $v['id'];
                         $excel_data[$k]['create_time'] = $v['create_time'];
@@ -326,9 +324,13 @@ class OfficeBargain extends Basic
                         $excel_data[$k]['income_money'] = $m_real->sumField('money',['bargain_id'=>$v['id'], 'is_del'=>0]);
                         $excel_data[$k]['subtract'] = $v['commission'] - $excel_data[$k]['income_money'];
 
-                        if ($v['role'] == 3) {
-                            $agent_data = $redis->getRedisCache(2, $v['agent_id']);
-                            $excel_data[$k]['agent_name'] = $agent_data['name'];
+                        $agent_data = $this->m_bargain->agentBargainAll('b.name', ['a.id'=>$v['id'],'a.status'=>['<>', 30]]);
+                        if ($agent_data) {
+                            $name_string = '';
+                            foreach ($agent_data as $vv) {
+                                $name_string .= $vv['name'].',';
+                            }
+                            $excel_data[$k]['agent_name'] = rtrim($name_string, ',');
                         } else {
                             $excel_data[$k]['agent_name'] = '';
                         }