Commit dba2d09c authored by hujun's avatar hujun

修改

parent 0cb658c5
...@@ -26,12 +26,9 @@ use think\exception\PDOException; ...@@ -26,12 +26,9 @@ use think\exception\PDOException;
class Finance extends Basic class Finance extends Basic
{ {
/** /**
* 成交报告 * 成交报告
* *
* @return \think\Response|\think\response\View * @return \think\Response
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
*/ */
public function reportList() public function reportList()
{ {
...@@ -143,7 +140,7 @@ class Finance extends Basic ...@@ -143,7 +140,7 @@ class Finance extends Basic
$data['data']['list'] = $bargain->getBargainList($pageNo, $pageSize, $order, $fields, $where, $audit_level); $data['data']['list'] = $bargain->getBargainList($pageNo, $pageSize, $order, $fields, $where, $audit_level);
$data['data']['total'] = $bargain->getBargainTotal($where, $audit_level); $data['data']['total'] = $bargain->getBargainTotal($where, $audit_level);
$data['data']['step'] = $check_status; $data['data']['step'] = $check_status;
} catch (\PDOException $e) { } catch (\Exception $e) {
return $this->response(101, '内部错误,获取列表失败!请联系运营。'); return $this->response(101, '内部错误,获取列表失败!请联系运营。');
} }
...@@ -178,7 +175,7 @@ class Finance extends Basic ...@@ -178,7 +175,7 @@ class Finance extends Basic
try { try {
$status = $bargain->addCheckBargain($this->params['id'], $params, $this->params['source'], $this->params['status']); $status = $bargain->addCheckBargain($this->params['id'], $params, $this->params['source'], $this->params['status']);
} catch (PDOException $e) { } catch (\Exception $e) {
return $this->response(101, '内部错误,审核失败!请联系运营。'); return $this->response(101, '内部错误,审核失败!请联系运营。');
} }
...@@ -318,7 +315,7 @@ class Finance extends Basic ...@@ -318,7 +315,7 @@ class Finance extends Basic
$content = '[应收总佣金:'.$update_data['commission'].']'. implode(' ',$log_data); $content = '[应收总佣金:'.$update_data['commission'].']'. implode(' ',$log_data);
$this->editRecordLog((int)$this->params["id"], $content, 1, '', $update_data['is_open']); $this->editRecordLog((int)$this->params["id"], $content, 1, '', $update_data['is_open']);
} catch (\PDOException $e) { } catch (\Exception $e) {
return $this->response(101, '内部错误,修改成交报告失败!请联系运营。'); return $this->response(101, '内部错误,修改成交报告失败!请联系运营。');
} }
...@@ -352,7 +349,7 @@ class Finance extends Basic ...@@ -352,7 +349,7 @@ class Finance extends Basic
try { try {
$data['data'] = $bargain->addBargainCommission($this->params['id'], $this->userId, $this->params['agent_id'], $data['data'] = $bargain->addBargainCommission($this->params['id'], $this->userId, $this->params['agent_id'],
$this->params['role'], $this->params['scale_fee'], $this->params['scale'], 1); $this->params['role'], $this->params['scale_fee'], $this->params['scale'], 1);
} catch (\PDOException $e) { } catch (\Exception $e) {
return $this->response(101, '内部错误,新增分佣提成失败!请联系运营。'); return $this->response(101, '内部错误,新增分佣提成失败!请联系运营。');
} }
...@@ -623,7 +620,7 @@ class Finance extends Basic ...@@ -623,7 +620,7 @@ class Finance extends Basic
try { try {
$data['data']['list'] = $m_commission->getCommissionBargainList($pageNo, $pageSize, 'a.id desc', $field, $where); $data['data']['list'] = $m_commission->getCommissionBargainList($pageNo, $pageSize, 'a.id desc', $field, $where);
$data['data']['total'] = $m_commission->getCommissionBargainListTotal($where); $data['data']['total'] = $m_commission->getCommissionBargainListTotal($where);
} catch (\PDOException $e) { } catch (\Exception $e) {
return $this->response(101, '内部错误,获取分佣提成明细列表失败!请联系运营。'); return $this->response(101, '内部错误,获取分佣提成明细列表失败!请联系运营。');
} }
...@@ -677,7 +674,7 @@ class Finance extends Basic ...@@ -677,7 +674,7 @@ class Finance extends Basic
$m_commission = new OPartialCommission(); $m_commission = new OPartialCommission();
try { try {
$data = $m_commission->getCommissionBargainColumn($pageNo, $pageSize, 'a.id desc', $field, $where); $data = $m_commission->getCommissionBargainColumn($pageNo, $pageSize, 'a.id desc', $field, $where);
} catch (\PDOException $e) { } catch (\Exception $e) {
return '<script>alert("导出分佣提成明细列表失败");window.close();</script>'; return '<script>alert("导出分佣提成明细列表失败");window.close();</script>';
} }
......
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