bargain_id

application/index/controller/Finance.php

@@ -2450,8 +2450,6 @@ class Finance extends Basic
         $is_show = 0;
         $msg = '';
 
-        try {
-            $order = new OPayLogModel();
         /*提交时间 start*/
         if (!empty($this->params['start_time']) && empty($this->params['end_time'])) {
             $where['a.create_time'] = ['> time', $this->params['start_time'] . ' 00:00:00'];
@@ -2553,6 +2551,12 @@ class Finance extends Basic
             $where['a.order_id'] = $this->params['order_id'];
         }
 
+        if (!empty($this->params['bargain_id'])) {
+            $where['a.bargain_id'] = $this->params['bargain_id'];
+        }
+
+        try {
+            $order = new OPayLogModel();
             if (empty($this->params['excel'])) {
                 $field = 'a.id,a.create_time,a.order_id,a.father_id,a.money,a.real_money,a.pay_type,a.type,a.source,a.transaction_fee,a.source,b.f_id,a.transfer_name,a.receipt_number,';
                 $field .= 'e.name,a.income_time,e.store_id,b.house_id,b.order_no,a.report_id,a.house_number,a.is_dividend,a.last_transfer_time,a.industry_type,a.agent_id,d.internal_address as address,e.name as agent_name';