1

application/index/controller/Finance.php

@@ -4407,8 +4407,7 @@ class Finance extends Basic
             $m_pay->updatePayLog($save_data);
 
             //收款记录日志
-            $s_receipt_operating_records = new ReceiptOperatingRecords();
-            $s_receipt_operating_records->addOperating($this->userId,2,$new_paylog_id);//$agents_id,$type,$remark,$pay_log_id
+            $this->pay_log($new_paylog_id,2);
 
             $code = 200;
             $msg = '撤销成功';
@@ -4419,6 +4418,21 @@ class Finance extends Basic
         return $this->response($code, $msg);
     }
 
+
+    /**
+     * 记录收款日志
+     * @param $new_pay_log_id
+     * @param $type
+     */
+    public function pay_log($new_pay_log_id,$type){
+        $m_pay_log = new OPayLogModel();
+        $s_receipt_operating_records = new ReceiptOperatingRecords();
+
+        $pay_log_info = $m_pay_log->getPayLogByOrderId("b.house_id", ['id'=>$new_pay_log_id]);
+
+        $s_receipt_operating_records->addOperating($this->userId,$type,$new_pay_log_id,$pay_log_info[0]["house_id"]);//$agents_id,$type,$remark,$pay_log_id
+    }
+
     public function getAdjustmentDetail() {
         $code = 101;
         if (empty($this->params['id'])) {
@@ -4664,8 +4678,7 @@ class Finance extends Basic
         $num = $m_pay->updatePayLog(['is_del'=>1, 'id'=>$this->params['pay_id']]);
         if ($num > 0) {
             //收款记录日志
-            $s_receipt_operating_records = new ReceiptOperatingRecords();
-            $s_receipt_operating_records->addOperating($this->userId,1,$this->params['pay_id']);
+            $this->pay_log($this->params['pay_id'],1);
 
             $code = 200;
         } else {

application/index/controller/ReceiptOperatingRecords.php

@@ -26,12 +26,12 @@ class ReceiptOperatingRecords extends Basic
      * @param $pay_log_id
      * @return bool
      */
-    public function addOperating($agents_id,$type,$pay_log_id)
+    public function addOperating($agents_id,$type,$pay_log_id,$house_id)
     {
         $data["agents_id"] = $agents_id;
         $data["type"] = $type;
         $data["remark"] = $type == 1 ? "删除收款ID：{$pay_log_id}" : "撤销调整收款ID：{$pay_log_id}";
-        $data["pay_log_id"] = $pay_log_id;
+        $data["house_id"] = $house_id;
 
         $result = $this->m_receipt_operating_records->saveOperating($data);//int(1)
 
@@ -60,11 +60,11 @@ class ReceiptOperatingRecords extends Basic
             $conditions['create_time'] = ['between time', [$params['start_date'].' 00:00:00',$params['end_date'].' 23:59:59']];
         }
 
-        if (!empty($params['pay_log_id'])) {
-            $conditions['pay_log_id'] = $params['pay_log_id'];
+        if (!empty($params['house_id'])) {
+            $conditions['house_id'] = $params['house_id'];
         }
 
-        $field  = 'id,agents_id,type,remark,pay_log_id,create_time';
+        $field  = 'id,agents_id,type,remark,house_id,create_time';
         $result = $this->m_receipt_operating_records->getOperatingList($field, $conditions, $pageNo, $pageSize);
         if (!$result)
             return $this->response("200", "成功", []);