Commit 13b7446d authored by zw's avatar zw

Merge remote-tracking branch 'origin/1224-v3.0.3' into 1224-v3.0.3

parents c1c1f88e 74cba3ef
...@@ -3675,6 +3675,7 @@ class Finance extends Basic ...@@ -3675,6 +3675,7 @@ class Finance extends Basic
$m_refund = new ORefundModel(); $m_refund = new ORefundModel();
$m_refund_log = new ORefundLogModel(); $m_refund_log = new ORefundLogModel();
$m_pay_log = new OPayLogModel(); $m_pay_log = new OPayLogModel();
$m_img = new OImg();
$field = 'id,refund_money,receipt_number,type,refund_cause,refund_way,card_no,bank,name,phone,agent_id,status,pay_log_id,create_time'; $field = 'id,refund_money,receipt_number,type,refund_cause,refund_way,card_no,bank,name,phone,agent_id,status,pay_log_id,create_time';
$refund_data = $m_refund->selectRefundByOrderNo($field, ['id'=>$this->params['id'], 'is_del'=>0]); $refund_data = $m_refund->selectRefundByOrderNo($field, ['id'=>$this->params['id'], 'is_del'=>0]);
...@@ -3704,6 +3705,11 @@ class Finance extends Basic ...@@ -3704,6 +3705,11 @@ class Finance extends Basic
$data['income_time'] = ''; $data['income_time'] = '';
} }
$img_where['img_id'] = $this->params['refund_id'];
$img_where['img_type'] = 3;
$img_where['img_status'] = 1;
$data['img'] = $m_img->getImgList($img_where);
$data['log'] = $m_refund_log->getListAll('operation_name,create_time,status', ['refund_id'=>$this->params['refund_id'], 'is_del'=>0]); $data['log'] = $m_refund_log->getListAll('operation_name,create_time,status', ['refund_id'=>$this->params['refund_id'], 'is_del'=>0]);
return $this->response($code, $msg, $data); return $this->response($code, $msg, $data);
} }
......
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