删除

application/index/controller/Finance.php

@@ -3491,29 +3491,21 @@ class Finance extends Basic
             'is_del'=>0,
             'id' => $this->params['id'],
         ];
-        $pay_adjustment = $m_pay_adjustment->getAdjustmentList('paylog_id,new_paylog_id', $where_adjustment);
-        if (empty($pay_adjustment[0]['paylog_id'])) {
+        $new_paylog_id = $m_pay_adjustment->getFieldValue('new_paylog_id', $where_adjustment);
+        if (empty($new_paylog_id)) {
             return $this->response($code, '无调整信息');
         }
 
-        //查找调整前的 paylog_id
         $where_2['is_del'] = $where['is_del'] = 0;
-        $where[] = ['EXP', "new_paylog_id = {$pay_adjustment[0]['paylog_id']} OR paylog_id =".$pay_adjustment[0]['paylog_id']];
+        $where['paylog_id'] = $new_paylog_id;
         $pay_log_id = $m_pay_adjustment->getFieldColumn('paylog_id', $where);
 
         if (count($pay_log_id) > 1) {
             return $this->response($code, '存在调整,不能删除.');
         }
 
-        //查找调整前前的 paylog_id
-        $where_2[] = ['EXP', "new_paylog_id = {$pay_adjustment[0]['new_paylog_id']} OR paylog_id =".$pay_adjustment[0]['new_paylog_id']];
-        $pay_log_id = $m_pay_adjustment->getFieldColumn('paylog_id', $where_2);
-        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]], 'is_del'=>0]);
+        $refund_id = $m_refund->getFind('id', ['pay_log_id'=>$new_paylog_id, 'is_del'=>0]);
         if ($refund_id > 0) {
             return $this->response($code, '入账存在退款，不能删除');
         }
@@ -3522,7 +3514,7 @@ class Finance extends Basic
 
         if ($num > 0) {
             $m_pay = new OPayLogModel();
-            $save_data['id'] = $pay_adjustment[0]['new_paylog_id'];
+            $save_data['id'] = $new_paylog_id;
             $save_data['is_del'] = 1;
             $m_pay->updatePayLog($save_data);
             $code = 200;
@@ -3704,15 +3696,18 @@ class Finance extends Basic
         }
 
         $m_pay = new OPayLogModel();
-        $num = $m_pay->getTotal('id', ['id'=>$this->params['pay_id']], '');
-        if (empty($num)) {
+        $pay_data = $m_pay->selectPayLogByOrderNo('id,source', ['id'=>$this->params['pay_id']]);
+        if (empty($pay_data[0]['id'])) {
             return $this->response($code, '无收款信息');
         }
 
         $m_pay_adjustment = new OPayLogAdjustment();
-
         $where['is_del'] = 0;
-        $where[] = ['EXP',"paylog_id = {$this->params['pay_id']} OR new_paylog_id = ".$this->params['pay_id']];
+        if ($pay_data[0]['source'] != 2) {
+            $where['paylog_id'] = $pay_data[0]['id'];
+        } else {
+            $where['new_paylog_id'] = $pay_data[0]['id'];
+        }
         $adjustment_id = $m_pay_adjustment->getAdjustmentList('id,paylog_id', $where);
         if (count($adjustment_id) > 0) {
             return $this->response($code, '存在调整，不能删除');