district_store

application/index/controller/OfficeFinance.php

@@ -9,6 +9,7 @@
 namespace app\index\controller;
 
 use app\api_broker\service\OfficeOrderLogService;
+use app\api_broker\service\RedisCacheService;
 use app\index\extend\Basic;
 use app\index\untils\ExportExcelUntil;
 use app\model\AAgents;
@@ -167,21 +168,28 @@ class OfficeFinance extends Basic
             $where['b.id'] = $this->params['bargain_id'];
         }
 
-        $m_fee                     = new OfficeOTaxes();
+        $m_fee   = new OfficeOTaxes();
+        $s_redis = new RedisCacheService();
         $fields = 'a.id,a.operation_date,e.name,e.phone,a.fee,b.house_number,f.address as internal_address,a.agent_id,b.father_id,b.id as bargain_id,b.order_id';
         if ($this->params['excel'] != 1) {
-            $data['data']['list']      = $m_fee->getTaxesList($pageNo, $pageSize, 'a.id desc', $fields, $where);
+            $list = $m_fee->getTaxesList($pageNo, $pageSize, 'a.id desc', $fields, $where);
+            foreach ($list as $k => $v) {
+                $agent_data = $s_redis->getRedisCache(2, $v['agent_id']);
+                $list[$k]['district_store'] = $agent_data['district_name'];
+            }
+            $data['data']['list']      = $list;
             $data['data']['total']     = $m_fee->getTaxesListTotal($where);
             $data['data']['total_fee'] = $m_fee->getTaxesListTotalFee($where);
             return $this->response($data['code'], $data['msg'], $data['data']);
         } else {
-            $data['data'] = $m_fee->getTaxesList($pageNo, 50000, 'a.id desc', $fields, $where);
+            $list = $m_fee->getTaxesList($pageNo, 50000, 'a.id desc', $fields, $where);
             if (count($data['data']) > 0) {
                 $excel_data = [];
-                foreach ($data['data'] as $k=>$v) {
+                foreach ($list as $k=>$v) {
+                    $agent_data = $s_redis->getRedisCache(2, $v['agent_id']);
+                    $list[$k]['district_store'] = $agent_data['district_name'];
                     $excel_data[$k]['bargain_id'] = $v['bargain_id'];
                     $excel_data[$k]['operation_date'] = $v['operation_date'];
-                    $excel_data[$k]['district_store'] = $v['district_store'];
                     $excel_data[$k]['name'] = $v['name'];
                     $excel_data[$k]['internal_address'] = $v['internal_address'];
                     $excel_data[$k]['house_number'] = $v['house_number'];

application/model/OfficeOTaxes.php

@@ -232,14 +232,6 @@ class OfficeOTaxes extends BaseModel
             ->limit($pageSize)
             ->page($pageNo)
             ->select();
-
-        $m_agent = new AAgents();
-        foreach ($data as $k => $v) {
-            if (isset($v['agent_id'])) {
-                $district_store             = $m_agent->getStoreDistrict('store_name,district_name', [ 'a.id' => $v['agent_id'] ]);
-                $data[$k]['district_store'] = $district_store['district_name'] . '-' . $district_store['store_name'];
-            }
-        }
         return $data;
     }