Commit 57acf1ca authored by zhuwei's avatar zhuwei

收款记录日志

parent 0febfd2f
...@@ -4400,6 +4400,11 @@ class Finance extends Basic ...@@ -4400,6 +4400,11 @@ class Finance extends Basic
$save_data['id'] = $new_paylog_id; $save_data['id'] = $new_paylog_id;
$save_data['is_del'] = 1; $save_data['is_del'] = 1;
$m_pay->updatePayLog($save_data); $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
$code = 200; $code = 200;
$msg = '撤销成功'; $msg = '撤销成功';
} else { } else {
......
...@@ -23,16 +23,15 @@ class ReceiptOperatingRecords extends Basic ...@@ -23,16 +23,15 @@ class ReceiptOperatingRecords extends Basic
* 新增记录 * 新增记录
* @param $agents_id * @param $agents_id
* @param $type * @param $type
* @param $remark * @param $pay_log_id
* @param $house_id
* @return bool * @return bool
*/ */
public function addOperating($agents_id,$type,$remark,$house_id) public function addOperating($agents_id,$type,$pay_log_id)
{ {
$data["agents_id"] = $agents_id; $data["agents_id"] = $agents_id;
$data["type"] = $type; $data["type"] = $type;
$data["remark"] = $remark; $data["remark"] = $type == 1 ? "删除收款ID:{$pay_log_id}" : "撤销调整收款ID:{$pay_log_id}";
$data["house_id"] = $house_id; $data["pay_log_id"] = $pay_log_id;
$result = $this->m_receipt_operating_records->saveOperating($data);//int(1) $result = $this->m_receipt_operating_records->saveOperating($data);//int(1)
...@@ -52,9 +51,7 @@ class ReceiptOperatingRecords extends Basic ...@@ -52,9 +51,7 @@ class ReceiptOperatingRecords extends Basic
public function receiptOperatingRecordsList() public function receiptOperatingRecordsList()
{ {
$params = $this->params; $params = $this->params;
/*$params = array(
"office_name" => '鳖'
);*/
$pageNo = empty($this->params['pageNo']) ? 1 : $this->params['pageNo']; $pageNo = empty($this->params['pageNo']) ? 1 : $this->params['pageNo'];
$pageSize = empty($this->params['pageSize']) ? 10 : $this->params['pageSize']; $pageSize = empty($this->params['pageSize']) ? 10 : $this->params['pageSize'];
$conditions = []; $conditions = [];
...@@ -63,11 +60,11 @@ class ReceiptOperatingRecords extends Basic ...@@ -63,11 +60,11 @@ class ReceiptOperatingRecords extends Basic
$conditions['create_time'] = ['between time', [$params['start_date'].' 00:00:00',$params['end_date'].' 23:59:59']]; $conditions['create_time'] = ['between time', [$params['start_date'].' 00:00:00',$params['end_date'].' 23:59:59']];
} }
if (!empty($params['house_id'])) { if (!empty($params['pay_log_id'])) {
$conditions['house_id'] = $params['house_id']; $conditions['pay_log_id'] = $params['pay_log_id'];
} }
$field = 'id,agents_id,type,remark,house_id,create_time'; $field = 'id,agents_id,type,remark,pay_log_id,create_time';
$result = $this->m_receipt_operating_records->getOperatingList($field, $conditions, $pageNo, $pageSize); $result = $this->m_receipt_operating_records->getOperatingList($field, $conditions, $pageNo, $pageSize);
if (!$result) if (!$result)
return $this->response("200", "成功", []); return $this->response("200", "成功", []);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment