bargain_id

application/index/controller/Finance.php

@@ -4121,7 +4121,7 @@ class Finance extends Basic
         }
 
         $m_pay_adjustment = new OPayLogAdjustment();
-        $adjustment_data = $m_pay_adjustment->getAdjustmentList('id,new_paylog_id,paylog_id,money', ['id'=>$this->params['id']]);
+        $adjustment_data = $m_pay_adjustment->getAdjustmentList('id,new_paylog_id,paylog_id,money,type', ['id'=>$this->params['id']]);
 
         if (empty($adjustment_data[0]['id'])) {
             return $this->response($code, '没有该调整详情');
@@ -4129,18 +4129,22 @@ class Finance extends Basic
         $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_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']]);
-        $result['adjustment'] = $this->numberTransitionString($result['adjustment']);
-        $result['adjustment_old'] = $this->numberTransitionString($result['adjustment_old']);
 
-        $bargain_data = $this->m_bargain->getDetail('id,father_id', ['order_id'=>$result['adjustment'][0]['order_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'];
+            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;
         }
+        $result['adjustment'][0]['bargain_id'] = $bargain_id;
 
-        $result['adjustment'][0]['bargain_id'] = empty($bargain_id) ? '':$bargain_id;
+        $result['adjustment'] = $this->numberTransitionString($result['adjustment']);
+        $result['adjustment_old'] = $this->numberTransitionString($result['adjustment_old']);
         $result['money'] = $adjustment_data[0]['money'];
         $result['id'] = $adjustment_data[0]['id'];
         $code = 200;