调整出账导出

application/index/controller/Finance.php

@@ -13,6 +13,7 @@ use app\api\service\ConvertCouponService;
 use app\api\service\CouponService;
 use app\api_broker\service\OrderLogService;
 use app\api_broker\service\PayLogService;
+use app\api_broker\service\RedisCacheService;
 use app\api_broker\service\VipService;
 use app\index\extend\Basic;
 use app\index\untils\ExportExcelUntil;
@@ -3767,7 +3768,7 @@ class Finance extends Basic
      */
     public function adjustment() {
         if (!$this->request->isAjax()) {
-            return view("adjustment");
+//            return view("adjustment");
         }
 
         $pageNo = empty($this->params['pageNo']) ? 1 : $this->params['pageNo'];
@@ -3896,15 +3897,24 @@ class Finance extends Basic
                 $where['b.order_id'] = $this->params['march_id'];
             }
 
-            $field = 'a.create_time,a.id,b.order_id,a.paylog_id,a.money,b.income_time,a.type,a.new_paylog_id,a.operation_id,b.order_id,e.house_id';
+            $field = 'a.create_time,a.id,b.order_id,e.house_id,a.paylog_id,a.money,b.income_time,a.type,a.new_paylog_id,a.operation_id';
+            $m_house = new GHouses();
+            $redis_service = new RedisCacheService();
+            if (empty($this->params['excel'])) {
                 $list = $m_paylog->getAdjustmentListLimit($pageNo, $pageSize, $order_ = 'a.id desc', $field, $where);
-
                 $data['total'] = $m_paylog->getAdjustmentListTotal($where);
+                //加时间条件
+                if ($is_show) {
+                    $data['money_total'] = $m_paylog->getMoneyTotal($where, 'a.money'); //总额
+                } else {
+                    $data['money_total'] = '';
+                }
 
-            $m_agent = new AAgents();
-            $m_house = new GHouses();
                 foreach ($list as $k => $v) {
-                $list[$k]['name'] = $m_agent->getAgentsById($v['operation_id'], 'name');
+                    if ($v['operation_id']) {
+                        $agent_data = $redis_service->getRedisCache(2, $v['operation_id']);
+                        $list[$k]['name'] = $agent_data['name'];
+                    }
                     if ($v['house_id']) {
                         $house_data = $m_house->getHouseDetail('id,internal_address', ['id'=>$v['house_id']]);
                         $list[$k]['house_id'] = $house_data['id'];
@@ -3915,14 +3925,45 @@ class Finance extends Basic
                     }
                 }
 
-            //加时间条件
-            if ($is_show) {
-                $data['money_total'] = $m_paylog->getMoneyTotal($where, 'a.money'); //总额
-            } else {
-                $data['money_total'] = '';
-            }
                 $data['list'] = $list;
                 $data['list'] = $this->numberTransitionString($data['list']);
+            } else {
+                $list = $m_paylog->getAdjustmentListLimit(1, 40000, $order_ = 'a.id desc', $field, $where);
+
+                if (!empty($list)) {
+                    $excel_data = [];
+                    foreach ($list as $k => $v) {
+                        $excel_data[$k]['create_time'] = $v['create_time'];
+                        $excel_data[$k]['id'] = $v['id'];
+                        $excel_data[$k]['order_id'] = $v['order_id'];
+                        $excel_data[$k]['paylog_id'] = $v['paylog_id'];
+
+                        if ($v['house_id']) {
+                            $house_data = $m_house->getHouseDetail('id,internal_address', ['id' => $v['house_id']]);
+                            $excel_data[$k]['house_id'] = $house_data['id'];
+                            $excel_data[$k]['address'] = $house_data['internal_address'];
+                        } else {
+                            $excel_data[$k]['house_id'] = '';
+                            $excel_data[$k]['address'] = '';
+                        }
+                        $excel_data[$k]['money'] = $v['money'];
+                        $excel_data[$k]['income_time'] = $v['income_time'];
+                        $excel_data[$k]['type'] = $v['type'];
+                        $excel_data[$k]['new_paylog_id'] = $v['new_paylog_id'];
+
+                        if ($v['operation_id']) {
+                            $agent_data = $redis_service->getRedisCache(2, $v['operation_id']);
+                            $excel_data[$k]['name'] = $agent_data['name'];
+                        }
+
+                    }
+                    $export = new ExportExcelUntil();
+                    $title = ['提交时间', '调整ID', '调整前带看ID', '调整前收款ID', '调整前商铺ID', '调整前商铺地址', '调整金额', '入账日期', '调整类型', '调整后收款ID', '提交人'];
+                    $export->exportTable('调整出账', $excel_data, 10, '调整出账', $title);
+                }
+            }
+
+
         } catch (\Exception $e) {
             $code = 101;
             $msg  = '内部错误:'.$e->getMessage();