Commit a5505a3f authored by clone's avatar clone

id

parent b6627397
...@@ -641,6 +641,8 @@ class Finance extends Basic ...@@ -641,6 +641,8 @@ class Finance extends Basic
* @throws \Exception * @throws \Exception
*/ */
public function addTallAge() { public function addTallAge() {
if (empty($this->params['bargain_id'])) { if (empty($this->params['bargain_id'])) {
return $this->response(101, '新增实收参数错误'); return $this->response(101, '新增实收参数错误');
} }
...@@ -681,7 +683,8 @@ class Finance extends Basic ...@@ -681,7 +683,8 @@ class Finance extends Basic
$insert_data['operation_date'] = $operation_date; //开票日期 $insert_data['operation_date'] = $operation_date; //开票日期
$m_fee = new OTaxes(); $m_fee = new OTaxes();
$m_fee->editData($insert_data, $this->params['id']); //开票新增和编辑 $ids= $m_fee->editData($insert_data, $this->params['id']); //开票新增和编辑
echo $ids;
$father_id = $m_fee->id; $father_id = $m_fee->id;
$m_agent = new AAgents(); $m_agent = new AAgents();
......
...@@ -45,7 +45,6 @@ class BaseModel extends Model ...@@ -45,7 +45,6 @@ class BaseModel extends Model
} }
if($kv){//编辑 if($kv){//编辑
$res=$this->save($data,[$key=>$kv]); $res=$this->save($data,[$key=>$kv]);
}else{ }else{
......
...@@ -59,7 +59,7 @@ class OTaxes extends BaseModel ...@@ -59,7 +59,7 @@ class OTaxes extends BaseModel
*/ */
public function addTaxes($data, $bargain_id, int $agent_id, $father_id = 0, $total_fee = 0, $operation_date = '') public function addTaxes($data, $bargain_id, int $agent_id, $father_id = 0, $total_fee = 0, $operation_date = '')
{ {
echo 222;
$insert_data = []; $insert_data = [];
foreach ($data as $k => $v) { foreach ($data as $k => $v) {
$insert_data[$k]['id'] = $v['fee_id']; $insert_data[$k]['id'] = $v['fee_id'];
...@@ -133,7 +133,8 @@ class OTaxes extends BaseModel ...@@ -133,7 +133,8 @@ class OTaxes extends BaseModel
foreach ($data as $k => $v) { foreach ($data as $k => $v) {
if (isset($v['role'])) { if (isset($v['role'])) {
$agent_name = $m_agent->getAgentInfo('id,name,phone', $v['agent_id']); $agent_name = $m_agent->getAgentInfo('id,name,phone', $v['agent_id']);
$result[$k]['id'] = $agent_name['id']; $result[$k]['id'] = $v['id'];
$result[$k]['agent_id'] = $agent_name['id'];
$result[$k]['name'] = $agent_name['name']; $result[$k]['name'] = $agent_name['name'];
$result[$k]['phone'] = $agent_name['phone']; $result[$k]['phone'] = $agent_name['phone'];
$result[$k]['role'] = $v['role']; $result[$k]['role'] = $v['role'];
......
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