增加字段

application/index/controller/Finance.php

@@ -2416,7 +2416,7 @@ class Finance extends Basic
 
             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,';
-                $field .= 'e.name,a.income_time,e.store_id,b.house_id,b.order_no,a.report_id,a.house_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';
                 $list = $order->getAddPayLogOrderListLimit($pageNo, $pageSize, $order_ = 'a.id desc', $field, $where);
                 $data['total'] = $order->getAddPayLogOrderListLimitTotal($where);
 
@@ -3160,6 +3160,8 @@ class Finance extends Basic
         $result['adjustment'] = $this->numberTransitionString($result['adjustment']);
         $result['adjustment_old'] = $this->numberTransitionString($result['adjustment_old']);
 
+        $bargain_id = $this->m_bargain->getFieldValue('id', ['order_id'=>$result['adjustment']['order_id']]);
+        $result['adjustment'][0]['bargain_id'] = empty($bargain_id) ? '':$bargain_id;
         $result['money'] = $adjustment_data[0]['money'];
         $result['id'] = $adjustment_data[0]['id'];
         $code = 200;