Commit 7eb908b9 authored by hujun's avatar hujun

office

parent 1e2c7d90
...@@ -267,8 +267,8 @@ class OfficeFinance extends Basic ...@@ -267,8 +267,8 @@ class OfficeFinance extends Basic
$where['e.id'] = $this->params['partial_id']; $where['e.id'] = $this->params['partial_id'];
} }
$field = 'a.id,a.confirm_date,a.practical_fee,b.scale_fee,b.scale,b.role,d.internal_address,b.agent_id,cash,'; $field = 'a.id,a.confirm_date,a.practical_fee,b.scale_fee,b.scale,b.role,d.s.address as internal_address,b.agent_id,cash,';
$field .= 'service_charge,charity_fund,real_fee,a.real_income_id,a.should_commission,d.internal_address,b.father_id,b.id as bargain_id'; $field .= 'service_charge,charity_fund,real_fee,a.real_income_id,a.should_commission,b.father_id,b.id as bargain_id';
$m_commission = new OfficeOPartialCommission(); $m_commission = new OfficeOPartialCommission();
try { try {
......
...@@ -101,11 +101,12 @@ class OfficeOPartialCommission extends BaseModel ...@@ -101,11 +101,12 @@ class OfficeOPartialCommission extends BaseModel
public function getCommissionBargainColumn($pageNo, $pageSize, $order_ = 'id desc', $fields, $where) public function getCommissionBargainColumn($pageNo, $pageSize, $order_ = 'id desc', $fields, $where)
{ {
$data = $this->alias('a') $data = $this->alias('a')
->join('o_bargain b', 'a.bargain_id = b.id', 'left') ->join('office_o_bargain b', 'a.bargain_id = b.id', 'left')
->join('o_order c', 'b.order_id = c.id', 'left') ->join('office_o_order c', 'b.order_id = c.id', 'left')
->join('g_houses d', 'c.house_id = d.id', 'left') ->join("office_g_room r", "c.house_id = r.id", "left")
->join("office_g_building s", "r.building_id = s.id", "left")
->join('a_agents e', 'b.agent_id = e.id', 'left') ->join('a_agents e', 'b.agent_id = e.id', 'left')
->join('o_real_income f', 'a.real_income_id = f.id', 'left') ->join('office_o_real_income f', 'a.real_income_id = f.id', 'left')
->where($where) ->where($where)
->order($order_) ->order($order_)
->limit($pageSize) ->limit($pageSize)
...@@ -182,7 +183,7 @@ class OfficeOPartialCommission extends BaseModel ...@@ -182,7 +183,7 @@ class OfficeOPartialCommission extends BaseModel
$result = $this->field($field) $result = $this->field($field)
->alias("a") ->alias("a")
->join("a_agents b", "a.agent_id=b.id", "left") ->join("a_agents b", "a.agent_id=b.id", "left")
->join("o_bargain c", "a.bargain_id=c.id or a.bargain_id = c.father_id", "left") ->join("office_o_bargain c", "a.bargain_id=c.id or a.bargain_id = c.father_id", "left")
->where($params) ->where($params)
->order("a.create_time desc") ->order("a.create_time desc")
->select(); ->select();
...@@ -221,9 +222,9 @@ class OfficeOPartialCommission extends BaseModel ...@@ -221,9 +222,9 @@ class OfficeOPartialCommission extends BaseModel
{ {
return $this->alias('a') return $this->alias('a')
->field($field) ->field($field)
->join('o_real_income b', 'a.real_income_id = b.id', 'left') ->join('office_o_real_income b', 'a.real_income_id = b.id', 'left')
->join('a_agents d', 'a.agent_id = d.id', 'left') ->join('a_agents d', 'a.agent_id = d.id', 'left')
->join('o_bargain e', 'a.bargain_id = e.id', 'left') ->join('office_o_bargain e', 'a.bargain_id = e.id', 'left')
->where($params) ->where($params)
->limit($pageSize) ->limit($pageSize)
->page($pageNo) ->page($pageNo)
...@@ -234,8 +235,8 @@ class OfficeOPartialCommission extends BaseModel ...@@ -234,8 +235,8 @@ class OfficeOPartialCommission extends BaseModel
public function getSumMoney($field, $where) { public function getSumMoney($field, $where) {
return $this->alias('a') return $this->alias('a')
->field($field) ->field($field)
->join('o_bargain b', 'a.bargain_id = b.id', 'left') ->join('office_o_bargain b', 'a.bargain_id = b.id', 'left')
->join('o_real_income c', ' a.real_income_id = c.id', 'left') ->join('office_o_real_income c', ' a.real_income_id = c.id', 'left')
->where($where) ->where($where)
->find(); ->find();
} }
...@@ -248,84 +249,13 @@ class OfficeOPartialCommission extends BaseModel ...@@ -248,84 +249,13 @@ class OfficeOPartialCommission extends BaseModel
public function getCommissionTotalInfo($field, $where) { public function getCommissionTotalInfo($field, $where) {
return $this->alias('a') return $this->alias('a')
->field('distinct a.id') ->field('distinct a.id')
->join('o_real_income b', 'a.real_income_id = b.id', 'left') ->join('office_o_real_income b', 'a.real_income_id = b.id', 'left')
->join('a_agents d', 'a.agent_id = d.id', 'left') ->join('a_agents d', 'a.agent_id = d.id', 'left')
->join('o_bargain e', 'a.bargain_id = e.id', 'left') ->join('office_o_bargain e', 'a.bargain_id = e.id', 'left')
->where($where) ->where($where)
->sum($field); ->sum($field);
} }
/**
* 分佣提成汇总表
*
* @param int $pageNo
* @param int $pageSize
* @param string $order_
* @param string $field
* @param string $params
* @param $operation_start_data
* @param $operation_end_data
* @return mixed
*/
public function getCommissionTotalListV2($pageNo = 1, $pageSize = 15, $order_ = 'a.id desc', $field = '', $params = '', $operation_start_data, $operation_end_data)
{
try {
$data = $this->alias('a')
->field($field)
->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)
->order($order_)
->limit($pageSize)
->page($pageNo)
->group('b.id')
->select();
$m_agent = new AAgents();
$m_tax = new OTaxes();
foreach ($data as $k => $v) {
if (isset($v['agent_id'])) {
$district_store = $m_agent->getStoreDistrict('store_name,district_name', [ 'a.id' => $v['agent_id'] ]);
$data[$k]['district_store'] = $district_store['district_name'] . '-' . $district_store['store_name'];
// //去除多次应分佣金
// $should_commission = $this->where('confirm_date', 'between time', [ $operation_start_data, $operation_end_data ])
// ->where('agent_id', $v['agent_id'])
// ->where('confirm_status', 1)
// ->where('is_del', 0)
// ->group('bargain_id')
// ->column('should_commission');
//
// $data[$k]['should_commission'] = 0;
// foreach ($should_commission as $kk => $vv) {
// $data[$k]['should_commission'] += $vv;
// }
}
}
$result['status'] = 'successful';
$result['data'] = $data;
} catch (\Exception $e) {
$result['status'] = 'fail';
$result['msg'] = $e->getMessage();
}
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
...@@ -339,26 +269,10 @@ class OfficeOPartialCommission extends BaseModel ...@@ -339,26 +269,10 @@ class OfficeOPartialCommission extends BaseModel
public function getCommissionTotalListTotal($params) public function getCommissionTotalListTotal($params)
{ {
return $this->alias('a') return $this->alias('a')
->join('o_real_income b', 'a.real_income_id = b.id', 'left') ->join('office_o_real_income b', 'a.real_income_id = b.id', 'left')
->join('o_taxes c', 'a.agent_id = c.agent_id', 'left') ->join('office_o_taxes c', 'a.agent_id = c.agent_id', 'left')
->join('a_agents d', 'a.agent_id = d.id', 'left') ->join('a_agents d', 'a.agent_id = d.id', 'left')
->join('o_bargain e', 'a.bargain_id = e.id', 'left') ->join('office_o_bargain e', 'a.bargain_id = e.id', 'left')
->where($params)
->group('a.agent_id')
->count();
}
/**
* @param $params
* @return int|string
*/
public function getCommissionTotalListTotalV2($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) ->where($params)
->group('a.agent_id') ->group('a.agent_id')
->count(); ->count();
...@@ -376,7 +290,7 @@ class OfficeOPartialCommission extends BaseModel ...@@ -376,7 +290,7 @@ class OfficeOPartialCommission extends BaseModel
try { try {
$data = $this->field('confirm_status') $data = $this->field('confirm_status')
->alias('a') ->alias('a')
->join('o_bargain b', 'a.bargain_id = b.id', 'left') ->join('office_o_bargain b', 'a.bargain_id = b.id', 'left')
->where('EXP', 'a.id ='.$bargain_id . ' or b.father_id = '. $bargain_id) ->where('EXP', 'a.id ='.$bargain_id . ' or b.father_id = '. $bargain_id)
->where('b.status', '<>', 30) ->where('b.status', '<>', 30)
->where('a.is_del', 0) ->where('a.is_del', 0)
...@@ -448,25 +362,6 @@ class OfficeOPartialCommission extends BaseModel ...@@ -448,25 +362,6 @@ class OfficeOPartialCommission extends BaseModel
return $this->where($where)->value($field); return $this->where($where)->value($field);
} }
/**
* @param $field
* @param $where
* @return array|false|\PDOStatement|string|\think\Model
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
*/
public function sumCommission($field, $where)
{
$where['a.is_del'] = 0;
$where['b.is_del'] = 0;
return $partial_commission = $this->field($field)
->alias('a')
->join('o_real_income b', 'a.real_income_id = b.id', 'left')
->where($where)
->find();
}
/** /**
* @param $fields * @param $fields
* @param $where * @param $where
...@@ -530,7 +425,7 @@ class OfficeOPartialCommission extends BaseModel ...@@ -530,7 +425,7 @@ class OfficeOPartialCommission extends BaseModel
$date = $this $date = $this
->field($field) ->field($field)
->alias("a") ->alias("a")
->join("o_real_income b", "a.real_income_id = b.id", "left") ->join("office_o_real_income b", "a.real_income_id = b.id", "left")
->where($where_) ->where($where_)
->select(); ->select();
return $date; return $date;
......
...@@ -335,7 +335,7 @@ class OfficeOTaxes extends BaseModel ...@@ -335,7 +335,7 @@ class OfficeOTaxes extends BaseModel
public function sumBargainFee($field = 'a.fee', $where) { public function sumBargainFee($field = 'a.fee', $where) {
return $this->field($field) return $this->field($field)
->alias('a') ->alias('a')
->join('o_bargain b', 'a.bargain_id = b.id', 'left') ->join('office_o_bargain b', 'a.bargain_id = b.id', 'left')
->join('a_agents c', 'b.agent_id = c.id', 'left') ->join('a_agents c', 'b.agent_id = c.id', 'left')
->where($where) ->where($where)
->sum($field); ->sum($field);
......
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