Commit b9f40450 authored by hujun's avatar hujun

实收金额汇总

parent e33e067b
...@@ -1684,6 +1684,7 @@ class Finance extends Basic ...@@ -1684,6 +1684,7 @@ class Finance extends Basic
} }
$data['data']['list'] = $list; $data['data']['list'] = $list;
$data['data']['total'] = $m_partial->getCommissionTotalListTotalV2($where); $data['data']['total'] = $m_partial->getCommissionTotalListTotalV2($where);
$data['data']['total_money'] = $m_partial->getCommissionTotalField('a.practical_fee', $where);
} else { } else {
$data['code'] = 101; $data['code'] = 101;
$data['msg'] = '内部错误'.$result_data['msg']; $data['msg'] = '内部错误'.$result_data['msg'];
...@@ -2833,9 +2834,9 @@ class Finance extends Basic ...@@ -2833,9 +2834,9 @@ class Finance extends Basic
*/ */
public function collectingBill() { public function collectingBill() {
$params = $this->params; $params = $this->params;
if (!isset($params["agent_id"]) || !isset($params["report_id"]) || if (empty($params["agent_id"]) || empty($params["report_id"]) ||
!isset($params["order_id"]) || !isset($params["order_no"]) | !isset($params["collecting_bill"]) || empty($params["order_id"]) || empty($params["order_no"]) | empty($params["collecting_bill"]) ||
!isset($params["house_number"]) || !isset($params["industry_type"]) ) { empty($params["house_number"]) || empty($params["industry_type"]) ) {
return $this->response("101", "请求参数错误"); return $this->response("101", "请求参数错误");
} }
......
...@@ -332,6 +332,17 @@ class OPartialCommission extends BaseModel ...@@ -332,6 +332,17 @@ class OPartialCommission extends BaseModel
return $result; return $result;
} }
public function getCommissionTotalField($filed, $params) {
return $this->alias('a')
->join('a_agents b', 'a.agent_id = b.id', 'left')
->join('o_bargain c', 'a.bargain_id = c.id', 'left')
->join('o_real_income d', 'a.real_income_id = d.id', 'left')
->join('o_taxes f', 'a.bargain_id = f.bargain_id', 'left')
->where($params)
->group('b.id')
->sum($filed);
}
/** /**
* @param $params * @param $params
* @return int|string * @return int|string
......
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