Commit ec7fc62f authored by hujun's avatar hujun

修改

parent bf6c294b
......@@ -86,7 +86,7 @@ class OfficeRoomService
/*楼盘与经纪人关系处理 start*/
//案场权限人
if (!empty($data['agent_data'])) {
$result_agent_data = $this->releaseRelationshipV2($data['agent_data'], $id, 1, $agent_id, $data['internal_title'], $site_id);
$result_agent_data = $this->releaseRelationshipV2($data['agent_data'], $id, 1, $agent_id, $data['title'], $site_id);
if ($result_agent_data['status'] == 'fail') {
$result['status'] = 'fail';
$result['msg'] = '新增或编辑案场权限人失败,' . $result_agent_data['msg'];
......@@ -96,7 +96,7 @@ class OfficeRoomService
//盘方
if (!empty($data['agent_dish'])) {
$result_agent_dish = $this->releaseRelationshipV2($data['agent_dish'], $id, 2, $agent_id, $data['internal_title'], $site_id);
$result_agent_dish = $this->releaseRelationshipV2($data['agent_dish'], $id, 2, $agent_id, $data['title'], $site_id);
if ($result_agent_dish['status'] == 'fail') {
$result['status'] = 'fail';
$result['msg'] = '新增或编辑盘方失败,' . $result_agent_dish['msg'];
......@@ -109,7 +109,7 @@ class OfficeRoomService
$this->delAgentHouse(3, $id, 0);
unset($data['exclusive_ids']);
} else {
$result_exclusive_ids = $this->releaseRelationshipV2($data['exclusive_ids'], $id, 3, $agent_id, $data['internal_title'], $site_id);
$result_exclusive_ids = $this->releaseRelationshipV2($data['exclusive_ids'], $id, 3, $agent_id, $data['title'], $site_id);
if ($result_exclusive_ids['status'] == 'fail') {
$result['status'] = 'fail';
$result['msg'] = '新增或编辑独家方失败,' . $result_exclusive_ids['msg'];
......@@ -215,7 +215,7 @@ class OfficeRoomService
$field = 'id,building_id,is_show,is_exclusive_type,is_rent,status,source,price_total,price,slotting_fee,';
$field .= 'management_fee,station_start,station_end,area,floor,room_number,floor_tag,enter_date,';
$field .= 'payment_month,deposit_month,age_limit_start,age_limit_end,is_register,is_partition,carport,decoration,';
$field .= 'rent_free,shop_sign,fee_rule';
$field .= 'rent_free,shop_sign,fee_rule,agent_start_time,agent_end_time,landlord_remark';
$data = $this->m_office_room->getFindData($field, ['id' => $id]);
if ($data) {
......@@ -256,11 +256,12 @@ class OfficeRoomService
/*图片 start*/
$img_data = $this->m_office_img->getListAll('id,img_type,img_name', ['house_id'=>$id]);
if ($app == 0) {
foreach ($img_data as $k => $v) {
switch ($v->img_type) {
switch ($v['img_type']) {
case 1 :
$data['cover'] = $v->img_name;
$data['cover'] = $v['img_name'];
break;
case 2 :
$data['slide_show'][$k]['img_name'] = $v['img_name'];
......@@ -270,7 +271,7 @@ class OfficeRoomService
$data['plan'][$k]['img_name'] = $v['img_name'];
$data['plan'][$k]['id'] = $v['id'];
break;
default :
case 4 :
$data['exclusive_img'][$k]['img_name'] = $v['img_name'];
$data['exclusive_img'][$k]['id'] = $v['id'];
}
......@@ -282,7 +283,7 @@ class OfficeRoomService
$file_url['file_name'] = $img_url;
$file_url['save_path'] = $v['img_name'];
switch ($v->img_type) {
switch ($v['img_type']) {
case 1 :
$data['cover'] = $file_url;
break;
......@@ -292,7 +293,7 @@ class OfficeRoomService
case 3 :
$data['plan'][] = $file_url;
break;
default :
case 4 :
$data['exclusive_img'][] = $file_url;
}
}
......
......@@ -139,7 +139,10 @@ class OfficeGImg extends BaseModel
if (isset($house_img_add)) {
$this->db_->insertAll($house_img_add);
}
$this->saveAll($house_img_edit);
if (!empty($house_img_edit)) {
$this->saveAll($house_img_edit);
}
$result['status'] = 'successful';
} catch (\Exception $e) {
$result['status'] = 'fail';
......
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