收款调整详情

application/index/controller/Finance.php

@@ -2616,11 +2616,13 @@ class Finance extends Basic
                 $m_house = new GHouses();
                 $m_refund = new ORefundModel();
                 foreach ($list as $k=>$v) {
-                    if ($v['source'] == 2) {
-                        $source_id = $m_pay_adjustment->getFieldColumn('id', ['new_paylog_id'=> $v['id']]);
+                    $list[$k]['source_id'] = '';
+                    if ($v['source'] == 0) {
+                        $source_id = $m_pay_adjustment->getFieldColumn('id', ['paylog_id'=> $v['id']]);
                         $list[$k]['source_id'] = empty($source_id) ? 0 : implode(',', $source_id);
+                        $list[$k]['source'] = 2;
                     } else {
-                        $list[$k]['source_id'] = '';
+                        $list[$k]['source'] = 0;
                     }
 
                     $num = $m_refund->getFind('id',['pay_log_id'=>$v['id'],'is_del'=>0]);
@@ -4019,7 +4021,7 @@ class Finance extends Basic
         $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';
         $where['a.is_del'] = $where_2['a.is_del'] = $where_3['a.is_del'] = 0;
-        $where_2['a.paylog_id'] = $where['a.id'] = $where_3['a.pay_log_id'] = $this->params['pay_id'];
+        $where_2['a.paylog_id'] = $where['a.father_id'] = $where_3['a.pay_log_id'] = $this->params['pay_id'];
         $list = $m_paylog->getAddPayLogOrderListLimit(1, 1000, '', $field, $where);
         $m_store = new AStore();
         $m_pay_adjustment = new OPayLogAdjustment();
@@ -4029,11 +4031,13 @@ class Finance extends Basic
         $m_refund = new ORefundModel();
         $m_agent = new AAgents();
         foreach ($list as $k=>$v) {
-            if ($v['source'] == 2) {
-                $source_id = $m_pay_adjustment->getFieldColumn('id', ['new_paylog_id'=> $v['id']]);
+            $list[$k]['source_id'] = '';
+            if ($v['source'] == 0) {
+                $source_id = $m_pay_adjustment->getFieldColumn('id', ['paylog_id'=> $v['id']]);
                 $list[$k]['source_id'] = empty($source_id) ? 0 : implode(',', $source_id);
+                $list[$k]['source'] = 2;
             } else {
-                $list[$k]['source_id'] = '';
+                $list[$k]['source'] = 0;
             }
 
             $num = $m_refund->getFind('id',['pay_log_id'=>$v['id'],'is_del'=>0]);