1

application/index/controller/Finance.php

@@ -3400,29 +3400,36 @@ class Finance extends Basic
         }
 
         $m_pay_adjustment = new OPayLogAdjustment();
-        $where = [
+        $where_adjustment = [
+            'is_del'=>0,
             'id' => $this->params['id'],
         ];
-        $pay_adjustment = $m_pay_adjustment->getAdjustmentList('paylog_id,new_paylog_id', $where);
+        $pay_adjustment = $m_pay_adjustment->getAdjustmentList('paylog_id,new_paylog_id', $where_adjustment);
         if (empty($pay_adjustment[0]['paylog_id'])) {
             return $this->response($code, '无调整信息');
         }
 
-        $where = [
-            ['EXP', "new_paylog_id = {$pay_adjustment[0]['paylog_id']} OR paylog_id =".$pay_adjustment[0]['paylog_id']],
-        ];
+        //查找调整前的 paylog_id
+        $where['is_del'] = 0;
+        $where[] = ['EXP', "new_paylog_id = {$pay_adjustment[0]['paylog_id']} OR paylog_id =".$pay_adjustment[0]['paylog_id']];
         $pay_log_id = $m_pay_adjustment->getFieldColumn('paylog_id', $where);
 
         if (count($pay_log_id) > 1) {
             return $this->response($code, '存在调整,不能删除.');
         }
 
-        $pay_log_id = $m_pay_adjustment->getFieldColumn('paylog_id', ['in', $pay_log_id]);
-
+        //查找调整前前的 paylog_id
+        $pay_log_id = $m_pay_adjustment->getFieldColumn('paylog_id', ['paylog_id'=>['in', $pay_log_id]]);
         if (count($pay_log_id) > 1) {
             return $this->response($code, '存在调整,不能删除.');
         }
 
+        $m_refund = new ORefundModel();
+        $refund_id = $m_refund->getFind('id', ['pay_log_id'=>['in',[$pay_adjustment[0]['paylog_id'], $pay_log_id]]]);
+        if ($refund_id > 0) {
+            return $this->response($code, '入账存在退款，不能删除');
+        }
+
         $num = $m_pay_adjustment->updatePayLogAdjustment(['is_del'=>1, 'id'=>$this->params['id']]);
 
         if ($num > 0) {
@@ -3615,13 +3622,11 @@ class Finance extends Basic
         }
 
         $m_pay_adjustment = new OPayLogAdjustment();
-        $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) {
+        $where['is_del'] = 0;
+        $where[] = ['EXP',"paylog_id = {$this->params['pay_id']} OR new_paylog_id = ".$this->params['pay_id']];
+        $adjustment_id = $m_pay_adjustment->getAdjustmentList('id,paylog_id', $where);
+        if (count($adjustment_id) > 0) {
             return $this->response($code, '存在调整，不能删除');
         }
 
@@ -3632,7 +3637,6 @@ class Finance extends Basic
         }
         $num = $m_pay->updatePayLog(['is_del'=>1, 'id'=>$this->params['pay_id']]);
         if ($num > 0) {
-            $m_pay_adjustment->updatePayLogAdjustment(['id'=>$adjustment_id[0]['id'], 'is_del'=>1]);
             $code = 200;
         } else {
             $code = 101;