bargain_id

application/index/controller/Finance.php

@@ -4127,21 +4127,12 @@ class Finance extends Basic
             return $this->response($code, '没有该调整详情');
         }
         $m_pay = new OPayLogModel();
-        $result['adjustment'] = $m_pay->getOrderHouse('a.id,a.order_id,b.house_id,c.internal_address,a.income_time,a.type,a.pay_type,a.money', ['a.id'=> $adjustment_data[0]['new_paylog_id']]);
+        $result['adjustment'] = $m_pay->getOrderHouse('a.id,a.order_id,b.house_id,c.internal_address,a.income_time,a.type,a.pay_type,a.money,a.bargain_id', ['a.id'=> $adjustment_data[0]['new_paylog_id']]);
         $result['adjustment_old'] = $m_pay->getOrderHouse('a.id,a.order_id,a.agent_id,a.agent_name,a.create_time,b.house_id,c.internal_address,a.income_time,a.type,a.pay_type,a.type', ['a.id'=> $adjustment_data[0]['paylog_id']]);
 
-        $bargain_id = 0;
-        if (!in_array($adjustment_data[0]['type'], [3,6,7])) {
-            $bargain_data = $this->m_bargain->getDetail('id,father_id', ['order_id'=>$result['adjustment'][0]['order_id']]);
-
-            if ($bargain_data['father_id'] > 0) {
-                $bargain_id = $bargain_data['father_id'];
-            } else {
-                $bargain_id = $bargain_data['id'];
-            }
-            $bargain_id = empty($bargain_id) ? 0:$bargain_id;
+        if (in_array($adjustment_data[0]['type'], [3,6,7])) {
+            $result['adjustment'][0]['bargain_id'] = 0;
         }
-        $result['adjustment'][0]['bargain_id'] = $bargain_id;
 
         $result['adjustment'] = $this->numberTransitionString($result['adjustment']);
         $result['adjustment_old'] = $this->numberTransitionString($result['adjustment_old']);