删除收款和删除调整

application/index/controller/Finance.php

@@ -3417,6 +3417,12 @@ class Finance extends Basic
             return $this->response($code, '存在调整,不能删除.');
         }
 
+        $pay_log_id = $m_pay_adjustment->getFieldColumn('paylog_id', ['in', $pay_log_id]);
+
+        if (count($pay_log_id) > 1) {
+            return $this->response($code, '存在调整,不能删除.');
+        }
+
         $num = $m_pay_adjustment->updatePayLogAdjustment(['is_del'=>1, 'id'=>$this->params['id']]);
 
         if ($num > 0) {
@@ -3609,11 +3615,16 @@ class Finance extends Basic
         }
 
         $m_pay_adjustment = new OPayLogAdjustment();
-        $adjustment_id = $m_pay_adjustment->getFieldColumn('id', [['EXP',"paylog_id = {$this->params['pay_id']} OR new_paylog_id = ".$this->params['pay_id']]]);
+        $adjustment_id = $m_pay_adjustment->getAdjustmentList('id,paylog_id', [['EXP',"paylog_id = {$this->params['pay_id']} OR new_paylog_id = ".$this->params['pay_id']]]);
         if (count($adjustment_id) > 1) {
             return $this->response($code, '存在调整，不能删除');
         }
 
+        $pay_log_id = $m_pay_adjustment->getAdjustmentList('id', ['paylog_id'=>$adjustment_id[0]['paylog_id']]);
+        if (count($pay_log_id) > 1) {
+            return $this->response($code, '存在调整，不能删除');
+        }
+
         $m_refund = new ORefundModel();
         $refund_id = $m_refund->getFind('id', ['pay_log_id'=>$this->params['pay_id']]);
         if ($refund_id > 0) {
@@ -3621,7 +3632,7 @@ class Finance extends Basic
         }
         $num = $m_pay->updatePayLog(['is_del'=>1, 'id'=>$this->params['pay_id']]);
         if ($num > 0) {
-            $m_pay_adjustment->updatePayLogAdjustment(['id'=>['in', $adjustment_id], 'is_del'=>1]);
+            $m_pay_adjustment->updatePayLogAdjustment(['id'=>$adjustment_id[0]['id'], 'is_del'=>1]);
             $code = 200;
         } else {
             $code = 101;