Skip to content

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

bug

parent 2ecfaa4d
Hide whitespace changes
Inline Side-by-side
Showing with 82 additions and 26 deletions
application/index/controller/Finance.php
View file @ 5c79e86b
...@@ -251,24 +251,24 @@ class Finance extends Basic ...@@ -251,24 +251,24 @@ class Finance extends Basic
if ($data['data'] == 1) { if ($data['data'] == 1) {
//新增实收佣金 array 5 todo feel_id 大于0 的表示新增 否则修改 //新增实收佣金 array 5 todo feel_id 大于0 的表示新增 否则修改
// $m_real->addRealIncome($this->params['practical_fee'], $this->params['id'], $this->userId); // $m_real->addRealIncome($this->params['practical_fee'], $this->params['id'], $this->userId);
$practical_fee_arr = $this->params["practical_fee"]; $practical_fee_arr = $this->params["practical_fee"];
$bargain_id = $this->params["id"]; $bargain_id = $this->params["id"];
$add_real_arr = $update_real_arr = []; $add_real_arr = $update_real_arr = [];
$i = $j = 0; $i = $j = 0;
foreach ($practical_fee_arr as $item) { foreach ($practical_fee_arr as $item) {
if(!$item['fee'] || !$item['operation_date']){ if (!$item['fee'] || !$item['operation_date']) {
continue; continue;
} }
if ($item["fee_id"] > 0 ) { if ($item["fee_id"] > 0) {
$update_real_arr[$i]['id'] = $item['fee_id']; $update_real_arr[$i]['id'] = $item['fee_id'];
$update_real_arr[$i]['bargain_id'] = $bargain_id; $update_real_arr[$i]['bargain_id'] = $bargain_id;
$update_real_arr[$i]['operation_id'] = $this->userId; $update_real_arr[$i]['operation_id'] = $this->userId;
$update_real_arr[$i]['money'] = $item['fee']; $update_real_arr[$i]['money'] = $item['fee'];
$update_real_arr[$i]['income_time'] = $item['operation_date']; $update_real_arr[$i]['income_time'] = $item['operation_date'];
$i++; $i++;
}else{ } else {
$add_real_arr[$j]['bargain_id'] = $bargain_id; $add_real_arr[$j]['bargain_id'] = $bargain_id;
$add_real_arr[$j]['operation_id'] = $this->userId; $add_real_arr[$j]['operation_id'] = $this->userId;
$add_real_arr[$j]['money'] = $item['fee']; $add_real_arr[$j]['money'] = $item['fee'];
...@@ -277,10 +277,10 @@ class Finance extends Basic ...@@ -277,10 +277,10 @@ class Finance extends Basic
} }
} }
if($i > 0 ){ if ($i > 0) {
$m_real->addRealIncome($update_real_arr); $m_real->addRealIncome($update_real_arr);
} }
if($j > 0){ if ($j > 0) {
$m_real->addRealIncome($add_real_arr); $m_real->addRealIncome($add_real_arr);
} }
} else { } else {
...@@ -656,13 +656,62 @@ class Finance extends Basic ...@@ -656,13 +656,62 @@ class Finance extends Basic
if (empty($bargain_data['id'])) { if (empty($bargain_data['id'])) {
return $this->response(101, '新增失败，成交报告数据异常'); return $this->response(101, '新增失败，成交报告数据异常');
} }
//todo 修改成交报告 判断id> 0
$m_partial = new OPartialCommission(); $m_partial = new OPartialCommission();
$insert_data = $this->params; $data = $this->params["commission_date"];
$insert_data['role'] = $bargain_data['role'];
$insert_data['agent_id'] = $bargain_data['agent_id'];
$data = $m_partial->addCommission($this->params, $this->userId); $add_arr = $update_arr = [];
return $this->response("200", "request success", $data); $i = $j = 0;
foreach ($data as $item) {
if (!$item['fee'] || !$item['operation_date']) {
continue;
}
if ($item["id"] > 0) {
$update_arr[$i]['id'] = $item['id'];
$update_arr[$i]['practical_fee'] = $item["practical_fee"];
$update_arr[$i]['cash'] = $item["cash"];
$update_arr[$i]['service_charge'] = $item['service_charge'];
$update_arr[$i]['charity_fund'] = $item['charity_fund'];
$update_arr[$i]['real_fee'] = $item['real_fee'];
$update_arr[$i]['operation_id'] = $this->userId;
//确认分佣加时间 否则 只是保存分佣数据
if ($item['is_confirm_date'] == 1) {
$update_arr[$i]['confirm_date'] = date("Y-m-d H:i:s",time());
$update_arr[$i]['confirm_status'] = 1;
}
$i++;
} else {
$add_arr[$j]['bargain_id'] = $this->params['bargain_id'];
$add_arr[$j]['practical_fee'] = $item['practical_fee'];
$add_arr[$j]['cash'] = $item['cash'];
$add_arr[$j]['service_charge'] = $item['service_charge'];
$add_arr[$j]['charity_fund'] = $item['charity_fund'];
$add_arr[$j]['real_fee'] = $item['real_fee'];
$add_arr[$j]['operation_id'] = $this->userId;
$add_arr[$j]['should_commission'] = $item['should_commission'];
$add_arr[$j]['scale'] = $item['scale'];
$add_arr[$j]['role'] = $item['role'];
$add_arr[$j]['agent_id'] = $item['agent_id'];
//确认分佣加时间 否则 只是保存分佣数据
if ($item['is_confirm_date'] == 1) {
$add_arr[$j]['confirm_date'] = date("Y-m-d H:i:s",time());
$add_arr[$j]['confirm_status'] = 1;
}
$j++;
}
}
if ($i > 0) {
$m_partial->addCommission($update_arr);
}
if ($j > 0) {
$m_partial->addCommission($add_arr);
}
// $data = $m_partial->addCommission($this->params, $this->userId);
return $this->response("200", "request success", []);
} }
/** /**
...@@ -739,9 +788,9 @@ class Finance extends Basic ...@@ -739,9 +788,9 @@ class Finance extends Basic
$m_fee->editData($insert_data, $this->params['id']); //开票新增和编辑 $m_fee->editData($insert_data, $this->params['id']); //开票新增和编辑
$father_id = 0; $father_id = 0;
if($this->params['id'] && $this->params['id'] > 0 ){ //编辑 if ($this->params['id'] && $this->params['id'] > 0) { //编辑
$father_id = $this->params['id']; $father_id = $this->params['id'];
}else{ } else {
$father_id = $m_fee->id; $father_id = $m_fee->id;
} }
...@@ -849,9 +898,9 @@ class Finance extends Basic ...@@ -849,9 +898,9 @@ class Finance extends Basic
$where['b.house_number'] = [ 'like', '%' . $this->params['house_number'] . '%' ]; $where['b.house_number'] = [ 'like', '%' . $this->params['house_number'] . '%' ];
} }
$m_fee = new OTaxes(); $m_fee = new OTaxes();
$data['data']['list'] = $m_fee->getTaxesList($pageNo, $pageSize, 'a.id desc', $fields, $where); $data['data']['list'] = $m_fee->getTaxesList($pageNo, $pageSize, 'a.id desc', $fields, $where);
$data['data']['total'] = $m_fee->getTaxesListTotal($where); $data['data']['total'] = $m_fee->getTaxesListTotal($where);
$data['data']['total_fee'] = $m_fee->getTaxesListTotalFee($where); $data['data']['total_fee'] = $m_fee->getTaxesListTotalFee($where);
return $this->response($data['code'], $data['msg'], $data['data']); return $this->response($data['code'], $data['msg'], $data['data']);
......
application/model/OBargainModel.php
View file @ 5c79e86b
...@@ -615,10 +615,17 @@ class OBargainModel extends Model ...@@ -615,10 +615,17 @@ class OBargainModel extends Model
} }
} }
$result[$k]['partial_commission'] = $m_partial->field('id,scale,practical_fee,cash,service_charge,charity_fund,real_fee,confirm_date,confirm_status,should_commission') $partial_commission = $m_partial->field('id,scale,practical_fee,cash,service_charge,charity_fund,real_fee,confirm_date,confirm_status,should_commission')
->where('bargain_id', $v['id']) ->where('bargain_id', $v['id'])
->where('is_del', 0) ->where('is_del', 0)
->order("id desc")
->select(); ->select();
//todo 最后一个分佣提成如果不为空则取其值
if ($partial_commission && $partial_commission[0]["scale"] > 0) {
$result[$k]["scale"] = $partial_commission[0]["scale"];
$result[$k]["scale_fee"] = $partial_commission[0]["should_commission"];
}
$result[$k]['partial_commission'] = $partial_commission;
} }
return $result; return $result;
} }
......
application/model/OPartialCommission.php
View file @ 5c79e86b
...@@ -136,11 +136,10 @@ class OPartialCommission extends BaseModel ...@@ -136,11 +136,10 @@ class OPartialCommission extends BaseModel
* 增加和编辑实收佣金 * 增加和编辑实收佣金
* *
* @param $data * @param $data
* @param $agent_id
* @return int|string * @return int|string
*/ */
public function addCommission($data, $agent_id) { public function addCommission($data) {
$insert_data['id'] = $data['id']; /* $insert_data['id'] = $data['id'];
$insert_data['bargain_id'] = $data['bargain_id']; //成交报告id $insert_data['bargain_id'] = $data['bargain_id']; //成交报告id
$insert_data['practical_fee'] = $data['practical_fee']; //实收佣金 $insert_data['practical_fee'] = $data['practical_fee']; //实收佣金
$insert_data['cash'] = $data['cash']; //现金奖 $insert_data['cash'] = $data['cash']; //现金奖
...@@ -162,7 +161,8 @@ class OPartialCommission extends BaseModel ...@@ -162,7 +161,8 @@ class OPartialCommission extends BaseModel
return $this->insert($insert_data); return $this->insert($insert_data);
} else { } else {
return $this->update($insert_data); return $this->update($insert_data);
} }*/
return $this->saveAll($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