Skip to content

T
tl_estate
Commit 5f8d6e5c authored by clone's avatar clone
Browse files
Options

1

parent 4e48972a
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 15 deletions
application/index/controller/Finance.php
View file @ 5f8d6e5c
...@@ -3732,10 +3732,10 @@ class Finance extends Basic ...@@ -3732,10 +3732,10 @@ class Finance extends Basic
$params_img['img_id'] = $params['id']; $params_img['img_id'] = $params['id'];
} }
$field = 'id,img_name'; $field = 'id,img_name';
$order = new OImg(); $order = new OImg();
$params_img['img_type'] = 2; $params_img['img_type'] = 2;
$res = $order->getImgList($params_img,$field); $res = $order->getImgList($params_img, $field);
foreach ($res as $k => $v) { foreach ($res as $k => $v) {
$res[$k]['img_name'] = CHAT_IMG_URL . $v['img_name']; $res[$k]['img_name'] = CHAT_IMG_URL . $v['img_name'];
} }
...@@ -4509,9 +4509,9 @@ class Finance extends Basic ...@@ -4509,9 +4509,9 @@ class Finance extends Basic
} }
$adjustment_data[0]['reckon_in_store_name'] = ""; $adjustment_data[0]['reckon_in_store_name'] = "";
if ($adjustment_data[0]['reckon_in_store'] > 0) { if ($adjustment_data[0]['reckon_in_store'] > 0) {
$agentModel = new AAgents(); $agentModel = new AAgents();
$agentWhere_["b.id"] = $adjustment_data[0]['reckon_in_store']; $agentWhere_["b.id"] = $adjustment_data[0]['reckon_in_store'];
$storeInfo = $agentModel->getAgentsStoreById($agentWhere_, "b.store_name"); $storeInfo = $agentModel->getAgentsStoreById($agentWhere_, "b.store_name");
$adjustment_data[0]['reckon_in_store_name'] = $storeInfo['store_name']; $adjustment_data[0]['reckon_in_store_name'] = $storeInfo['store_name'];
} }
...@@ -4523,11 +4523,12 @@ class Finance extends Basic ...@@ -4523,11 +4523,12 @@ class Finance extends Basic
$result['adjustment'][0]['bargain_id'] = 0; $result['adjustment'][0]['bargain_id'] = 0;
} }
$result['adjustment'] = $this->numberTransitionString($result['adjustment']); $result['adjustment'] = $this->numberTransitionString($result['adjustment']);
$result['adjustment_old'] = $this->numberTransitionString($result['adjustment_old']); $result['adjustment_old'] = $this->numberTransitionString($result['adjustment_old']);
$result['money'] = $adjustment_data[0]['money']; $result['money'] = $adjustment_data[0]['money'];
$result['id'] = $adjustment_data[0]['id']; $result['id'] = $adjustment_data[0]['id'];
$code = 200; $result['reckon_in_store_name'] = $adjustment_data[0]['reckon_in_store_name'];
$code = 200;
return $this->response($code, '', $result); return $this->response($code, '', $result);
} }
...@@ -4721,8 +4722,8 @@ class Finance extends Basic ...@@ -4721,8 +4722,8 @@ class Finance extends Basic
*/ */
public function delPayLog() public function delPayLog()
{ {
$code = 101; $code = 101;
$msg = ''; $msg = '';
if (empty($this->params['pay_id'])) { if (empty($this->params['pay_id'])) {
return $this->response($code, '参数错误'); return $this->response($code, '参数错误');
} }
...@@ -4926,7 +4927,7 @@ class Finance extends Basic ...@@ -4926,7 +4927,7 @@ class Finance extends Basic
$record_data['message'] = '[' . $house_title['house_title'] . ']退款成功'; $record_data['message'] = '[' . $house_title['house_title'] . ']退款成功';
$record_data['order_id'] = $refund_data[0]['order_id']; $record_data['order_id'] = $refund_data[0]['order_id'];
$record_data['house_id'] = $house_title['house_id']; $record_data['house_id'] = $house_title['house_id'];
$record_data['title'] = '退款成功-商铺'; $record_data['title'] = '退款成功-商铺';
$push->recordCheck(3, [$refund_data[0]['agent_id']], $this->userId, $record_data); $push->recordCheck(3, [$refund_data[0]['agent_id']], $this->userId, $record_data);
} }
if ($id > 0 && is_array($this->params['img_arr'])) { if ($id > 0 && is_array($this->params['img_arr'])) {
...@@ -4945,7 +4946,7 @@ class Finance extends Basic ...@@ -4945,7 +4946,7 @@ class Finance extends Basic
$record_data['message'] = '[' . $house_title['house_title'] . ']退款被驳回，驳回原因：' . $save_data['remark']; $record_data['message'] = '[' . $house_title['house_title'] . ']退款被驳回，驳回原因：' . $save_data['remark'];
$record_data['order_id'] = $refund_data[0]['order_id']; $record_data['order_id'] = $refund_data[0]['order_id'];
$record_data['house_id'] = $house_title['house_id']; $record_data['house_id'] = $house_title['house_id'];
$record_data['title'] = '退款驳回-商铺'; $record_data['title'] = '退款驳回-商铺';
$push->recordCheck(1, [$refund_data[0]['agent_id']], $this->userId, $record_data); $push->recordCheck(1, [$refund_data[0]['agent_id']], $this->userId, $record_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