Merge branch 'test'

application/index/controller/Finance.php

@@ -3660,7 +3660,7 @@ class Finance extends Basic
         $pay_data = [];
         try {
             $m_pay = new OPayLogModel();
-            $pay_fields = 'id,order_id,agent_name,create_time,income_time,house_number,type,real_money,income_time,transfer_name,';
+            $pay_fields = 'id,order_id,agent_name,create_time,income_time,house_number,type,real_money,income_time,transfer_name,bargain_id,';
             $pay_fields .= 'transaction_fee,is_dividend,receipt_number,source,pay_type,last_transfer_time,money,industry_type,received_money,type_ext';
             $pay_data = $m_pay->selectReceiptImgList($pay_fields, ['id'=>$this->params['pay_id']]);
             $pay_data = $pay_data[0];
@@ -3671,12 +3671,10 @@ class Finance extends Basic
                 $pay_data['is_open'] = 0;
                 $pay_data['price'] = 0;
             } else {
-                $bargain_data = $this->m_bargain->getDetail('id,father_id,price,is_open', ['order_id'=>$pay_data['order_id'], 'father_id'=>0]);
-                $bargain_id = $bargain_data['id'];
-                if ($bargain_data['father_id'] != 0) {
-                    $bargain_id = $bargain_data['father_id'];
-                }
-                $pay_data['bargain_id'] = empty($bargain_id)? '':$bargain_id;
+                $bargain_where[] = ['EXP', 'id='.$pay_data['bargain_id'].' or father_id='.$pay_data['bargain_id']];
+                $bargain_where['father_id'] = 0;
+                $bargain_data = $this->m_bargain->getDetail('id,father_id,price,is_open', $bargain_where);
+                $pay_data['bargain_id'] = empty($bargain_data['id'])? '':$bargain_data['id'];
                 $pay_data['is_open'] = empty($bargain_data['is_open']) ? 0 :$bargain_data['is_open'];
                 $pay_data['price'] = empty($bargain_data['price'])? 0:$bargain_data['price'];
 
@@ -3702,8 +3700,8 @@ class Finance extends Basic
             $m_report = new OReportModel();
             $pay_data['current_agent_name'] = '';
             $pay_data['current_agent_name'] = $pay_data['store_name'] = "";
-            if ($pay_data['type'] == 92 || $pay_data['type'] == 91) {
-                $where['a.order_id'] = $pay_data['order_id'];
+            if (($pay_data['type'] == 92 || $pay_data['type'] == 91) && $pay_data['bargain_id'] > 0) {
+                $where[] = ['EXP','a.id ='.$pay_data['bargain_id'].' or father_id='. $pay_data['bargain_id']];
                 $where['a.status'] = ['in','10,11,13'];
                 $where['a.role'] = ['in','3,4,5'];
                 $bargain_data = $this->m_bargain->agentBargainAll('a.role,a.scale,b.name', $where);