Skip to content

T
tl_estate
Commit 91fb5896 authored by hujun's avatar hujun
Browse files
Options

Merge remote-tracking branch 'origin/test' into test

parents 089036d2 66ce71ae
Hide whitespace changes
Inline Side-by-side
Showing with 68 additions and 46 deletions
application/api_broker/controller/OrderLog.php
View file @ 91fb5896
...@@ -160,7 +160,7 @@ class OrderLog extends Basic ...@@ -160,7 +160,7 @@ class OrderLog extends Basic
!isset($params["price"]) || !isset($params["commission"]) || !isset($params["commission_arr"])) { !isset($params["price"]) || !isset($params["commission"]) || !isset($params["commission_arr"])) {
return $this->response("101", "请求参数错误"); return $this->response("101", "请求参数错误");
} }
/* $params = array( /* $params = array(
"submit_agent_id" => 1,//申请经纪人id "submit_agent_id" => 1,//申请经纪人id
"submit_agent_name" => 1,//申请经纪人id "submit_agent_name" => 1,//申请经纪人id
"report_id" => 1,//报备id "report_id" => 1,//报备id
...@@ -176,8 +176,8 @@ class OrderLog extends Basic ...@@ -176,8 +176,8 @@ class OrderLog extends Basic
//`scale`'分佣比例 如 5表示百分之5', //`scale`'分佣比例 如 5表示百分之5',
// `scale_fee` '应分佣金 存分 ', // `scale_fee` '应分佣金 存分 ',
"commission_arr" => [ [ "role" => 10, "agent_id" => 10, "scale" => 10, "scale_fee" => 1222 ], "commission_arr" => '[ { "role" : 10, "agent_id" : 10, "scale" : 10, "scale_fee" : 1222 },
[ "role" => 11, "agent_id" => 12, "scale" => 13, "scale_fee" => 1112 ] ], { "role": 11, "agent_id" : 12, "scale": 13, "scale_fee" : 1112 }]',
);*/ );*/
$params["commission_arr"] = json_decode($params["commission_arr"], true); $params["commission_arr"] = json_decode($params["commission_arr"], true);
......
application/api_broker/service/HouseNumUpdateService.php
View file @ 91fb5896
...@@ -38,11 +38,12 @@ class HouseNumUpdateService ...@@ -38,11 +38,12 @@ class HouseNumUpdateService
$field = "b.id as house_id,b.status,b.residue_num"; $field = "b.id as house_id,b.status,b.residue_num";
$orderParams["a.id"] = $order_id; $orderParams["a.id"] = $order_id;
$houseInfo = $orderModel->getHouseInfoByOrderId($field,$orderParams); $houseInfo = $orderModel->getHouseInfoByOrderId($field,$orderParams);
if(count($houseInfo) > 0 && $houseInfo[0]["residue_num"] > 0 && $houseInfo[0]["status"] == 1){ if(count($houseInfo) > 0 && $houseInfo[0]["residue_num"] > 0 && $houseInfo[0]["status"] == 1){
//减数量 //减数量
$houseModel = new GHouses(); $houseModel = new GHouses();
$id = $houseInfo[0]["id"]; $id = $houseInfo[0]["house_id"];
$updateParams["residue_num"] = $houseInfo[0]["residue_num"] - 1; $updateParams["residue_num"] = $houseInfo[0]["residue_num"] - 1;
if( $houseInfo[0]["residue_num"] == 1 ){ if( $houseInfo[0]["residue_num"] == 1 ){
$updateParams["status"] = 2; $updateParams["status"] = 2;
...@@ -83,7 +84,7 @@ class HouseNumUpdateService ...@@ -83,7 +84,7 @@ class HouseNumUpdateService
//减数量 //减数量
$houseModel = new GHouses(); $houseModel = new GHouses();
$id = $houseInfo[0]["id"]; $id = $houseInfo[0]["house_id"];
$updateParams["residue_num"] = $houseInfo[0]["residue_num"] + 1; $updateParams["residue_num"] = $houseInfo[0]["residue_num"] + 1;
if( $houseInfo[0]["residue_num"] == 2 ){ if( $houseInfo[0]["residue_num"] == 2 ){
$updateParams["status"] = 1; $updateParams["status"] = 1;
......
application/api_broker/service/VerifyService.php
View file @ 91fb5896
...@@ -106,13 +106,13 @@ class VerifyService ...@@ -106,13 +106,13 @@ class VerifyService
} }
/** /**
* * 获取盘方经纪人ids
* @param $house_id * @param $house_id
* @return false|\PDOStatement|string|\think\Collection * @return false|\PDOStatement|string|\think\Collection
*/ */
public function getPanpartyAgentsByHouseId($house_id) public function getPanpartyAgentsByHouseId($house_id)
{ {
$houseToAgentModel = new GHousesToAgents(); $houseToAgentModel = new GHousesToAgents();
return $houseToAgentModel->getHousesAgents($house_id); return $houseToAgentModel->getHousesUpdateAgents($house_id);
} }
} }
\ No newline at end of file
application/model/GHousesToAgents.php
View file @ 91fb5896
...@@ -12,40 +12,41 @@ class GHousesToAgents extends BaseModel ...@@ -12,40 +12,41 @@ class GHousesToAgents extends BaseModel
/** /**
* @param $agents_id * @param $agents_id
* @param $houses_id * @param $houses_id
* @param $type //案场权限人:0,盘方:1,独家:2 * @param $type //案场权限人:0,盘方:1,独家:2
* @return array|false * @return array|false
* @throws \Exception * @throws \Exception
* @throws \think\db\exception\DataNotFoundException * @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException * @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException * @throws \think\exception\DbException
*/ */
public function addAgents($agents_id, $houses_id, $type){ public function addAgents($agents_id, $houses_id, $type)
$agent_arr = array(); {
$agents_id = array_unique(explode(',',$agents_id)); $agent_arr = array();
$del_agents_id = $record_agents_id = []; $agents_id = array_unique(explode(',', $agents_id));
$del_agents_id = $record_agents_id = [];
$where['type'] = $type; $where['type'] = $type;
$where['houses_id'] = $houses_id; $where['houses_id'] = $houses_id;
$where['is_del'] = 0; $where['is_del'] = 0;
$records = new GOperatingRecords(); $records = new GOperatingRecords();
$agents = new AAgents(); $agents = new AAgents();
//为空全部伪删除 //为空全部伪删除
if (empty($agents_id[0])) { if (empty($agents_id[0])) {
if ($type == 2) { if ($type == 2) {
$house_agents = $this->field('agents_id')->where('houses_id',$houses_id)->where('is_del',0)->select(); $house_agents = $this->field('agents_id')->where('houses_id', $houses_id)->where('is_del', 0)->select();
$name = array(); $name = array();
foreach ($house_agents as $k2 => $v2){ foreach ($house_agents as $k2 => $v2) {
$name[] = $agents->where('id',$v2['agents_id'])->value('name'); $name[] = $agents->where('id', $v2['agents_id'])->value('name');
} }
$records->record('',2,'删除盘方'.implode(',',$name),$houses_id); $records->record('', 2, '删除盘方' . implode(',', $name), $houses_id);
} }
$res = $this->where($where)->setField('is_del',1); $res = $this->where($where)->setField('is_del', 1);
} else { } else {
$houses_data = $this->where($where)->select(); $houses_data = $this->where($where)->select();
$key = 0; $key = 0;
foreach ($houses_data as $k=>$v) { foreach ($houses_data as $k => $v) {
if (!in_array($v['agents_id'], $agents_id) && ($type == $v['type']) && ($v['agents_id'] != NULL)) { if (!in_array($v['agents_id'], $agents_id) && ($type == $v['type']) && ($v['agents_id'] != NULL)) {
$agent_arr[$key]['id'] = $v['id']; $agent_arr[$key]['id'] = $v['id'];
$agent_arr[$key]['is_del'] = 1; $agent_arr[$key]['is_del'] = 1;
$key++; $key++;
...@@ -55,11 +56,11 @@ class GHousesToAgents extends BaseModel ...@@ -55,11 +56,11 @@ class GHousesToAgents extends BaseModel
} }
} }
foreach ($agents_id as $k=>$v) { foreach ($agents_id as $k => $v) {
$check = $this->where([ $check = $this->where([
'houses_id' => $houses_id, 'houses_id' => $houses_id,
'agents_id' => $v, 'agents_id' => $v,
'is_del' => 0 , 'is_del' => 0,
'type' => $type 'type' => $type
])->find(); ])->find();
if ($check) { if ($check) {
...@@ -67,7 +68,7 @@ class GHousesToAgents extends BaseModel ...@@ -67,7 +68,7 @@ class GHousesToAgents extends BaseModel
} }
$agent_arr[$key]['agents_id'] = $v; $agent_arr[$key]['agents_id'] = $v;
$agent_arr[$key]['houses_id'] = $houses_id; $agent_arr[$key]['houses_id'] = $houses_id;
$agent_arr[$key]['type'] = $type; $agent_arr[$key]['type'] = $type;
$key++; $key++;
if ($type == 2) { if ($type == 2) {
...@@ -78,19 +79,19 @@ class GHousesToAgents extends BaseModel ...@@ -78,19 +79,19 @@ class GHousesToAgents extends BaseModel
if (count($del_agents_id) > 0) { if (count($del_agents_id) > 0) {
$name = array(); $name = array();
foreach ($del_agents_id as $k2 => $v2){ foreach ($del_agents_id as $k2 => $v2) {
$name[] = $agents->where('id',$v2)->value('name'); $name[] = $agents->where('id', $v2)->value('name');
} }
$records->record('',2,'删除盘方:'.implode(',',$name),$houses_id); $records->record('', 2, '删除盘方:' . implode(',', $name), $houses_id);
} }
if (count($record_agents_id) > 0) { if (count($record_agents_id) > 0) {
$records = new GOperatingRecords(); $records = new GOperatingRecords();
$name = array(); $name = array();
foreach ($record_agents_id as $k2 => $v2){ foreach ($record_agents_id as $k2 => $v2) {
$name[] = $agents->where('id',$v2)->value('name'); $name[] = $agents->where('id', $v2)->value('name');
} }
$records->record('',2,'新增盘方:'.implode(',',$name),$houses_id); $records->record('', 2, '新增盘方:' . implode(',', $name), $houses_id);
} }
$res = $this->saveAll($agent_arr); $res = $this->saveAll($agent_arr);
...@@ -106,9 +107,10 @@ class GHousesToAgents extends BaseModel ...@@ -106,9 +107,10 @@ class GHousesToAgents extends BaseModel
* @param $houses_id * @param $houses_id
* @return bool|false|int * @return bool|false|int
*/ */
public function del($id, $houses_id) { public function del($id, $houses_id)
{
if ($id) { if ($id) {
$res = $this->save(['is_del' => 1],['agents_id'=>$id,'houses_id'=>$houses_id]); $res = $this->save([ 'is_del' => 1 ], [ 'agents_id' => $id, 'houses_id' => $houses_id ]);
} else { } else {
$res = false; $res = false;
} }
...@@ -129,10 +131,11 @@ class GHousesToAgents extends BaseModel ...@@ -129,10 +131,11 @@ class GHousesToAgents extends BaseModel
* @throws \think\db\exception\ModelNotFoundException * @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException * @throws \think\exception\DbException
*/ */
public function getAgentsHousesList($pageNo = 1, $pageSize = 15, $order_ = 'id desc', $field = '', $params = '') { public function getAgentsHousesList($pageNo = 1, $pageSize = 15, $order_ = 'id desc', $field = '', $params = '')
{
return $this->field($field) return $this->field($field)
->alias('a') ->alias('a')
->join('a_agents b', 'a.agents_id = b.id','left') ->join('a_agents b', 'a.agents_id = b.id', 'left')
->where($params) ->where($params)
->order($order_) ->order($order_)
->limit($pageSize) ->limit($pageSize)
...@@ -148,24 +151,26 @@ class GHousesToAgents extends BaseModel ...@@ -148,24 +151,26 @@ class GHousesToAgents extends BaseModel
* @throws \think\db\exception\ModelNotFoundException * @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException * @throws \think\exception\DbException
*/ */
public function getHouseByAgentId($field,$params){ public function getHouseByAgentId($field, $params)
{
$result = Db::name($this->table) $result = Db::name($this->table)
->field($field) ->field($field)
->alias("a") ->alias("a")
->join("g_houses b","a.houses_id = b.id","left") ->join("g_houses b", "a.houses_id = b.id", "left")
->where($params) ->where($params)
->select(); ->select();
// echo Db::name($this->table)->getLastSql(); // echo Db::name($this->table)->getLastSql();
return $result; return $result;
} }
public function getAgentsByHouseId($field,$params){ public function getAgentsByHouseId($field, $params)
{
$result = Db::name($this->table) $result = Db::name($this->table)
->field($field) ->field($field)
->alias("a") ->alias("a")
->join("a_agents b","a.agents_id = b.id","left") ->join("a_agents b", "a.agents_id = b.id", "left")
->where($params) ->where($params)
->select(); ->select();
//echo Db::name($this->table)->getLastSql(); //echo Db::name($this->table)->getLastSql();
...@@ -181,11 +186,25 @@ class GHousesToAgents extends BaseModel ...@@ -181,11 +186,25 @@ class GHousesToAgents extends BaseModel
* @throws \think\db\exception\ModelNotFoundException * @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException * @throws \think\exception\DbException
*/ */
public function getHousesAgents($houses_id) { public function getHousesAgents($houses_id)
{
$select_data = $this->field('b.id,name,a.type,b.phone')->alias('a')
->join('a_agents b', 'a.agents_id = b.id', 'LEFT')
->where([
'houses_id' => $houses_id,
'is_del' => 0
])->select();
return $select_data;
}
public function getHousesUpdateAgents($houses_id)
{
$select_data = $this->field('b.id,name,a.type,b.phone')->alias('a') $select_data = $this->field('b.id,name,a.type,b.phone')->alias('a')
->join('a_agents b','a.agents_id = b.id','LEFT') ->join('a_agents b', 'a.agents_id = b.id', 'LEFT')
->where([ ->where([
'houses_id' => $houses_id, 'houses_id' => $houses_id,
'type' => 2,
'is_del' => 0 'is_del' => 0
])->select(); ])->select();
...@@ -202,11 +221,12 @@ class GHousesToAgents extends BaseModel ...@@ -202,11 +221,12 @@ class GHousesToAgents extends BaseModel
* @throws \think\db\exception\ModelNotFoundException * @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException * @throws \think\exception\DbException
*/ */
public function getAgentList($house_id, $type = 1) { public function getAgentList($house_id, $type = 1)
{
return $this->field('b.id,device_id,store_name,d.internal_title,b.name,b.phone') return $this->field('b.id,device_id,store_name,d.internal_title,b.name,b.phone')
->alias('a') ->alias('a')
->join('a_agents b', 'a.agents_id = b.id','left') ->join('a_agents b', 'a.agents_id = b.id', 'left')
->join('a_store c', 'b.store_id = c.id','left') ->join('a_store c', 'b.store_id = c.id', 'left')
->join('g_houses d', 'd.id = a.houses_id', 'left') ->join('g_houses d', 'd.id = a.houses_id', 'left')
->where('houses_id', $house_id) ->where('houses_id', $house_id)
->where('type', $type) ->where('type', $type)
......
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