Skip to content

T
tl_estate
Commit 1bec173a authored by hujun's avatar hujun
Browse files
Options

实收汇总4

parent cefddf70
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 13 deletions
application/index/controller/Finance.php
View file @ 1bec173a
......@@ -1511,22 +1511,25 @@ class Finance extends Basic
$operation_start_data = $operation_end_data = $income_date = $operation_date = '';
$where['a.confirm_status'] = 1;
$is_bargain = 0;
$where_or = [];
/**收佣日期 start**/
$sql_string = 'or a.agent_id in (SELECT agent_id FROM o_taxes WHERE is_del=0 and father_id > 0 and operation_date';
if (!empty($this->params['income_start_date']) && empty($this->params['income_end_date'])) {
$where[0] = ['EXP', "b.income_time > '{$this->params['income_start_date']}' OR c.operation_date > '{$this->params['income_start_date']}'"];
// $where[0] = ['EXP', "b.income_time > '{$this->params['income_start_date']}' OR c.operation_date > '{$this->params['income_start_date']}'"];
$where[0] = ['EXP', "b.income_time > '{$this->params['income_start_date']}' {$sql_string} > '{$this->params['income_start_date']}' GROUP BY agent_id)"];
$income_date = date('Y.m.d', strtotime($this->params['income_start_date']));
$operation_start_data = $this->params['income_start_date'];
}
if (!empty($this->params['income_end_date']) && empty($this->params['income_start_date'])) {
$where[0] = ['EXP', "b.income_time < '{$this->params['income_end_date']}' OR c.operation_date < '{$this->params['income_end_date']}'"];
// $where[0] = ['EXP', "b.income_time < '{$this->params['income_end_date']}' OR c.operation_date < '{$this->params['income_end_date']}'"];
$where[0] = ['EXP', "b.income_time < '{$this->params['income_end_date']}' {$sql_string} > '{$this->params['income_end_date']}' GROUP BY agent_id)"];
$income_date = '-' . date('Y.m.d', strtotime($this->params['income_end_date']));
$operation_end_data = $this->params['income_end_date'];
}
if (!empty($this->params['income_start_date']) && !empty($this->params['income_end_date'])) {
$where[0] =['EXP', "b.income_time BETWEEN '{$this->params['income_start_date']}' AND '{$this->params['income_end_date']}'
OR c.operation_date BETWEEN '{$this->params['income_start_date']}' AND '{$this->params['income_end_date']}'"];
$where[0] =['EXP', "b.income_time BETWEEN '{$this->params['income_start_date']}' AND '{$this->params['income_end_date']}' {$sql_string} BETWEEN '{$this->params['income_start_date']}' AND '{$this->params['income_end_date']}' GROUP BY agent_id)"];
$income_date = date('Y.m.d', strtotime($this->params['income_start_date'])) . '-' . date('Y.m.d', strtotime($this->params['income_end_date']));
$operation_start_data = $this->params['income_start_date'];
......@@ -1536,27 +1539,24 @@ class Finance extends Basic
/**收佣日期 end**/
if (!empty($this->params['bargain_start_date']) && empty($this->params['bargain_end_date'])) {
$where[1] = ['EXP', "e.create_time > '{$this->params['bargain_start_date']} 00:00:00' OR c.operation_date > '{$this->params['bargain_start_date']}'"];
// $where[1] = ['EXP', "e.create_time > '{$this->params['bargain_start_date']} 00:00:00' OR c.operation_date > '{$this->params['bargain_start_date']}'"];
$where[1] = ['EXP', "e.create_time > '{$this->params['bargain_start_date']} 00:00:00' {$sql_string} > '{$this->params['bargain_start_date']}' GROUP BY agent_id)"];
$operation_date = date('Y.m.d', strtotime($this->params['bargain_start_date']));
$operation_start_data = $this->params['bargain_start_date'];
$is_bargain = 1;
}
if (!empty($this->params['bargain_end_date']) && empty($this->params['bargain_start_date'])) {
$where[1] = ['EXP', "e.create_time < '{$this->params['bargain_end_date']} 23:59:59' OR c.operation_date < '{$this->params['bargain_end_date']}'"];
$where[1] = ['EXP', "e.create_time < '{$this->params['bargain_end_date']} 23:59:59' {$sql_string} > '{$this->params['bargain_end_date']}' GROUP BY agent_id)"];
$operation_date = date('Y.m.d', strtotime($this->params['bargain_end_date']));
$operation_end_data = $this->params['bargain_end_date'];
$is_bargain = 1;
}
if (!empty($this->params['bargain_start_date']) && !empty($this->params['bargain_end_date'])) {
$where[1] =['EXP', "e.create_time BETWEEN '{$this->params['bargain_start_date']} 00:00:00' AND '{$this->params['bargain_end_date']} 23:59:59'
OR c.operation_date BETWEEN '{$this->params['bargain_start_date']}' AND '{$this->params['bargain_end_date']}'"];
$where[1] =['EXP', "e.create_time BETWEEN '{$this->params['bargain_start_date']} 00:00:00' AND '{$this->params['bargain_end_date']} 23:59:59' {$sql_string} BETWEEN '{$this->params['bargain_start_date']}' AND '{$this->params['bargain_end_date']}' GROUP BY agent_id)"];
$operation_date = date('Y.m.d', strtotime($this->params['bargain_start_date'])) . '-' . date('Y.m.d', strtotime($this->params['bargain_end_date']));
$operation_start_data = $this->params['bargain_start_date'];
$operation_end_data = $this->params['bargain_end_date'];
$is_bargain = 1;
......@@ -1582,7 +1582,7 @@ class Finance extends Basic
$m_partial = new OPartialCommission();
$m_store = new AStore();
$m_agent = new AAgents();
$where['c.is_del'] = 0;
if (empty($this->params['excel']) && $this->params['excel'] != 1) {
$m_tax = new OTaxes();
$taxes_where['a.father_id'] = ['>', 0];
......
application/model/OPartialCommission.php
View file @ 1bec173a
......@@ -224,7 +224,7 @@ class OPartialCommission extends BaseModel
$agent_id = $this->alias('a')
->field('a.agent_id,d.name,d.store_id,d.district_id,e.status')
->join('o_real_income b', 'a.real_income_id = b.id', 'left')
->join('o_taxes c', 'a.agent_id = c.agent_id', 'left')
// ->join('o_taxes c', 'a.agent_id = c.agent_id', 'left')
->join('a_agents d', 'a.agent_id = d.id', 'left')
->join('o_bargain e', 'a.bargain_id = e.id', 'left')
->where($params)
......
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