收款记录 Excel

application/index/controller/Finance.php

@@ -3047,7 +3047,7 @@ class Finance extends Basic
                 $field = 'a.id,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->getAddPayLogOrderListLimitExcel($pageNo, $pageSize, $order_ = 'a.id desc', $field, $where);
+                $data = $order->getAddPayLogOrderListLimit($pageNo, $pageSize, $order_ = 'a.id desc', $field, $where);
 
                 foreach ($data as $k => $v) {
                     if (!empty($v['user_phone'])) {
@@ -3071,6 +3071,9 @@ class Finance extends Basic
         return $this->response(200, $msg, $data);
     }
 
+    /**
+     * 收款记录 Excel
+     */
     public function getCollectionExcel() {
 
         $pageNo = 1;

application/model/OPayLogModel.php

@@ -348,23 +348,7 @@ class OPayLogModel extends Model
                 ->select();
     }
 
-    public function getAddPayLogOrderListLimitExcel($pageNo = 1, $pageSize = 15, $order_ = 'id desc', $field = '', $params = '')
-    {
-        $params["a.is_del"] = 0;
-        return $this->db_->field($field)
-            ->alias("a")
-            ->join("o_order b", "a.order_id = b.id", "left")
-            ->join("o_report c", "a.report_id = c.id", "left")
-            ->join('g_houses d', 'b.house_id = d.id', 'left')
-            ->join('a_agents e', 'a.agent_id=e.id', 'left')
-            ->join('a_store f', 'e.store_id=f.id', 'left')
-            ->join('a_district g', 'e.district_id=g.id', 'left')
-            ->limit($pageSize)
-            ->page($pageNo)
-            ->order($order_)
-            ->where($params)
-            ->select();
-    }
+
 
     /**
      * 收款记录总数

application/route.php

@@ -260,7 +260,7 @@ Route::group('index', [
     'getTallAgeList'                     => ['index/Finance/getTallAgeList', ['method' => 'GET']], //税费承担明细表
     'getCommissionTotalList'             => ['index/Finance/getCommissionTotalList', ['method' => 'GET']], //分佣提成汇总表
     'getCollection'                      => ['index/Finance/getCollection', ['method' => 'post|get']],//收款记录
-    'getCollectionExcel'                      => ['index/Finance/getCollectionExcel', ['method' => 'post|get']],//收款记录
+    'getCollectionExcel'                 => ['index/Finance/getCollectionExcel', ['method' => 'post|get']],//收款记录
     'addRealMoney'                       => ['index/Finance/addRealMoney', ['method' => 'post|get']],//新增实收
     'visitShop'                          => ['index/Supervise/visitShop', ['method' => 'get']],//门店拜访
     'carryOut'                           => ['index/Supervise/carryOut', ['method' => 'get']],//监督执行