调整删除和收款删除

application/index/controller/Finance.php

@@ -3400,13 +3400,19 @@ class Finance extends Basic
         }
 
         $m_pay_adjustment = new OPayLogAdjustment();
-        $pay_adjustment = $m_pay_adjustment->getAdjustmentList('new_paylog_id,paylog_id', ['id'=>$this->params['id']]);
+        $where = [
+            'id' => $this->params['id'],
+        ];
+        $pay_adjustment = $m_pay_adjustment->getAdjustmentList('new_paylog_id', $where);
 
         if (empty($pay_adjustment[0]['new_paylog_id'])) {
             return $this->response($code, '无调整信息');
         }
 
-        $pay_log_id = $m_pay_adjustment->getAdjustmentList('paylog_id', ['paylog_id'=>$pay_adjustment[0]['paylog_id']]);
+        $where = [
+            'paylog_id' => $pay_adjustment[0]['new_paylog_id'],
+        ];
+        $pay_log_id = $m_pay_adjustment->getAdjustmentList('paylog_id', $where);
 
         if (count($pay_log_id)) {
             return $this->response($code, '存在调整，不能删除');
@@ -3598,13 +3604,13 @@ class Finance extends Basic
         }
 
         $m_pay = new OPayLogModel();
-        $num = $m_pay->getTotal('id', ['id'=>$this->params['pay_id']]);
+        $num = $m_pay->getTotal('id', ['id'=>$this->params['pay_id']], '');
         if (empty($num)) {
             return $this->response($code, '无收款信息');
         }
 
         $m_pay_adjustment = new OPayLogAdjustment();
-        $adjustment_num = $m_pay_adjustment->getAdjustmentList('id', ['new_paylog_id'=>$this->params['pay_id']]);
+        $adjustment_num = $m_pay_adjustment->getAdjustmentList('id', ['paylog_id'=>$this->params['pay_id']]);
         if (count($adjustment_num)) {
             return $this->response($code, '存在调整，不能删除');
         }
@@ -3616,7 +3622,6 @@ class Finance extends Basic
         }
         $num = $m_pay->updatePayLog(['is_del'=>1, 'id'=>$this->params['pay_id']]);
         if ($num > 0) {
-            $m_pay_adjustment->updatePayLogAdjustment(['is_del'=>1,'id'=>$adjustment_num[0]['id']]);
             $code = 200;
         } else {
             $code = 101;

application/model/OPayLogAdjustment.php

@@ -29,6 +29,7 @@ class OPayLogAdjustment extends BaseModel{
      * @throws \think\exception\DbException
      */
     public function getAdjustmentList($field, $params){
+        $params['is_del'] = 0;
         return $this->db_
             ->field($field)
             ->where($params)