收款记录列表

application/index/controller/Collection.php

@@ -68,8 +68,12 @@ class Collection extends Basic
                 $where['a.house_number'] = $this->params['id'];
             }
 
-            if (!empty($this->params['store_name'])) {
-                $where['f.store_name'] = ['like','%'.$this->params['store_name'].'%'];
+            if (!empty($this->params['store_id'])) {
+                $where['f.id'] = $this->params['store_id'];
+            }
+
+            if (!empty($this->params['district_id'])) {
+                $where['g.id'] = $this->params['district_id'];
             }
 
             if (!empty($this->params['report_phone'])) {
@@ -81,7 +85,9 @@ class Collection extends Basic
             }
 
             if (empty($this->params['excel'])) {
-                $field = 'a.id,a.father_id,a.order_id,a.create_time,c.user_name,c.user_phone,a.money,a.real_money,a.pay_type,a.house_number,a.type,d.internal_title,d.internal_address,a.source,a.transaction_fee';
+                $field = 'a.id,a.father_id,a.order_id,a.create_time,c.user_name,c.user_phone,a.money,a.real_money,a.pay_type,
+                a.house_number,a.type,d.internal_title,d.internal_address,a.source,a.transaction_fee,c.report_agent_phone,
+                c.report_agent_name,f.store_name,g.district_name';
                 $data['data']['list'] = $order->getAddPayLogOrderListLmit($pageNo, $pageSize, $order_ = 'a.id desc', $field, $where);
                 $data['data']['total'] = $order->getAddPayLogOrderListLmitTotal($where);
                 $data['data']['money_total'] = $order->getMoneyTotal(); //总额
@@ -96,7 +102,7 @@ class Collection extends Basic
             } else {
                 $pageNo = 1;
                 $pageSize = 50000; //最多5万条数据
-                $field = 'a.create_time,c.user_name,c.user_phone,e.name,e.phone,f.store_name,g.district_name,a.money,a.real_money,a.transaction_fee,a.type,a.pay_type,d.internal_address,a.house_number,a.source';
+                $field = 'a.create_time,c.user_name,c.user_phone,c.report_agent_name,c.report_agent_phone,f.store_name,g.district_name,a.money,a.real_money,a.transaction_fee,a.type,a.pay_type,d.internal_address,a.house_number,a.source';
                 $data = $order->getAddPayLogOrderListLmit($pageNo, $pageSize, $order_ = 'a.id desc', $field, $where);
 
                 foreach ($data as $k=>$v) {