Skip to content

T
tl_estate
Commit 968cde11 authored by clone's avatar clone
Browse files
Options

Merge branch '0529-v3.3.0' of https://gitee.com/zwyjjc/tl_estate into 0529-v3.3.0

parents 8a99c682 4f781903
Hide whitespace changes
Inline Side-by-side
Showing with 855 additions and 65 deletions
application/api_broker/controller/User.php
View file @ 968cde11
...@@ -833,7 +833,13 @@ class User extends Basic ...@@ -833,7 +833,13 @@ class User extends Basic
} }
$user_id = $params['user_id']; $user_id = $params['user_id'];
$type = $params['type']; $type = $params['type'];
$result = $this->userLogService->userLog($user_id,$this->siteId,$type);
if(isset($params['entrust_type']) && ($params['entrust_type']== 1)){
$result = $this->OfficeUserLogService->userLog($user_id,$this->siteId,$type);
}else{
$result = $this->userLogService->userLog($user_id,$this->siteId,$type);
}
if(count($result) > 0){ if(count($result) > 0){
return $this->response("200", "success！", $result); return $this->response("200", "success！", $result);
......
application/api_broker/service/OfficePayLogService.php
View file @ 968cde11
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
namespace app\api_broker\service; namespace app\api_broker\service;
use app\model\OfficeOImg;
use app\model\OfficeOPayLogAdjustment; use app\model\OfficeOPayLogAdjustment;
use app\model\OfficeOPayLogModel; use app\model\OfficeOPayLogModel;
use app\model\OfficeORefundModel; use app\model\OfficeORefundModel;
...@@ -85,9 +86,8 @@ class OfficePayLogService ...@@ -85,9 +86,8 @@ class OfficePayLogService
if (count($pay_log_arr) < 0) { if (count($pay_log_arr) < 0) {
return -1; return -1;
} }
$oPayLogAdjustment = new OPayLogAdjustment();
$where_ = $this->adjustmentBin($new_pay_id, $pay_id, $money, $type, $agent_id, $pay_log_arr[0]["type"]); $where_ = $this->adjustmentBin($new_pay_id, $pay_id, $money, $type, $agent_id, $pay_log_arr[0]["type"]);
$oPayLogAdjustment->addAdjustment($where_); $this->payLogAdjustmentModel->addAdjustment($where_);
} }
/** /**
...@@ -271,7 +271,7 @@ class OfficePayLogService ...@@ -271,7 +271,7 @@ class OfficePayLogService
*/ */
private function addOImg($id, $type, $transfer_img) private function addOImg($id, $type, $transfer_img)
{ {
$oImgModel = new OImg(); $oImgModel = new OfficeOImg();
$oImgModel->addImgAll($id, $type, $transfer_img); $oImgModel->addImgAll($id, $type, $transfer_img);
} }
...@@ -283,7 +283,7 @@ class OfficePayLogService ...@@ -283,7 +283,7 @@ class OfficePayLogService
private function getOImg($id, $img_type) private function getOImg($id, $img_type)
{ {
//查询图片 //查询图片
$oImgModel = new OImg(); $oImgModel = new OfficeOImg();
$params["img_id"] = $id; $params["img_id"] = $id;
$params["img_type"] = $img_type; $params["img_type"] = $img_type;
$img_arr = $oImgModel->getImgList($params); $img_arr = $oImgModel->getImgList($params);
...@@ -295,7 +295,7 @@ class OfficePayLogService ...@@ -295,7 +295,7 @@ class OfficePayLogService
* @param $del_img * @param $del_img
*/ */
private function delOImg($type, $del_img){ private function delOImg($type, $del_img){
$oImgModel = new OImg(); $oImgModel = new OfficeOImg();
$ids = rtrim($del_img, ","); $ids = rtrim($del_img, ",");
$where_["id"] = array("in",$ids); $where_["id"] = array("in",$ids);
$where_["img_type"] = $type; $where_["img_type"] = $type;
......
application/index/controller/Finance.php
View file @ 968cde11
...@@ -26,6 +26,7 @@ use app\model\OBargainLogModel; ...@@ -26,6 +26,7 @@ use app\model\OBargainLogModel;
use app\model\OBargainModel; use app\model\OBargainModel;
use app\model\ODaily; use app\model\ODaily;
use app\model\OfficeOImg; use app\model\OfficeOImg;
use app\model\OfficeOPayLogModel;
use app\model\OImg; use app\model\OImg;
use app\model\OMarchInModel; use app\model\OMarchInModel;
use app\model\OPayLogAdjustment; use app\model\OPayLogAdjustment;
...@@ -3526,7 +3527,6 @@ class Finance extends Basic ...@@ -3526,7 +3527,6 @@ class Finance extends Basic
} }
} }
/** /**
* 收款列表记录上传图片 * 收款列表记录上传图片
* 朱伟 2018-07-04 * 朱伟 2018-07-04
...@@ -3565,44 +3565,6 @@ class Finance extends Basic ...@@ -3565,44 +3565,6 @@ class Finance extends Basic
} }
} }
/**
* 收款列表记录上传图片
* 朱伟 2018-07-04
*/
public function addReceiptOfficeImg(){
$params = $this->params;
$result = 0;
/*$params = array(
"img_id" => 1,
"img_name" => 123,
);*/
if(!isset($params["img_id"])){
return $this->response("101","请求参数错误");
}
if(!isset($params["img_name"])){
return $this->response("101","请求参数错误");
}
$order = new OfficeOImg();
foreach (explode(',',$params["img_name"]) as $k => $v){
$time = date("Y-m-d H:i:s", time());
$save_data["img_id"] = $params["img_id"];//id根据img_type区分是收款还是进场还是其他'
$save_data["img_type"] = 2 ;//图片类型:1进场，2收款
$save_data["img_name"] = $v;//图片名称
$save_data["img_status"] = 0 ;//删除状态 0正常 1删除
$save_data["update_time"] = $time;//更新时间
$save_data["create_time"] = $time;//创建时间
$result = $order->addImgOnce($save_data);
}
if($result){
return $this->response("200","成功");
}else{
return $this->response("101","失败");
}
}
/** /**
* 收款列表-删除上传图片 * 收款列表-删除上传图片
* 朱伟 2018-07-04 * 朱伟 2018-07-04
......
application/index/controller/OfficePayLog.php
View file @ 968cde11
...@@ -4,12 +4,14 @@ ...@@ -4,12 +4,14 @@
namespace app\index\controller; namespace app\index\controller;
use app\api_broker\service\OfficePayLogService;
use app\api_broker\service\RedisCacheService; use app\api_broker\service\RedisCacheService;
use app\index\extend\Basic; use app\index\extend\Basic;
use app\index\untils\ExportExcelUntil; use app\index\untils\ExportExcelUntil;
use app\model\OfficeGBuilding; use app\model\OfficeGBuilding;
use app\model\OfficeGRoom; use app\model\OfficeGRoom;
use app\model\OfficeOBargainModel; use app\model\OfficeOBargainModel;
use app\model\OfficeOImg;
use app\model\OfficeOPayLogAdjustment; use app\model\OfficeOPayLogAdjustment;
use app\model\OfficeOPayLogModel; use app\model\OfficeOPayLogModel;
use app\model\OfficeOrderModel; use app\model\OfficeOrderModel;
...@@ -982,4 +984,330 @@ class OfficePayLog extends Basic ...@@ -982,4 +984,330 @@ class OfficePayLog extends Basic
return $this->response("200","success",["residue_money"=>$result]); return $this->response("200","success",["residue_money"=>$result]);
} }
/**
* 编辑收款详情
*
* @return \think\Response
*/
public function getCollectionEdit() {
if (empty($this->params['pay_id'])) {
return $this->response(101, '参数错误');
}
$msg = "";
$code = 200;
try {
$m_pay = new OfficeOPayLogModel();
$id = $m_pay->selectReceiptImgList('id,source,type', ['id'=>$this->params['pay_id']]);
if (empty($id[0]['id'])) {
return $this->response(101, '没有该记录');
}
if ($id[0]['source'] == 2) {
unset($this->params['receipt_number']);
unset($this->params['transfer_name']);
unset($this->params['pay_type']);
} else {
$save_data['transfer_name'] = isset($this->params['transfer_name']) ? $this->params['transfer_name']:'';
$save_data['money'] = $this->params['money'];
$save_data['receipt_number'] = isset($this->params['receipt_number'])? $this->params['receipt_number']:'';
$save_data['pay_type'] = $this->params['pay_type'];
if (!empty($this->params['bargain_id'])) {
$save_data['bargain_id'] = $this->params['bargain_id'];
}
}
if (($id[0]['type'] == 10 && $this->params['type'] == 30) || ($id[0]['type'] == 30 && $this->params['type'] == 10)) {
$save_data['type'] = $this->params['type'];
}
if (($id[0]['type'] == 91 && $this->params['type'] == 92) || ($id[0]['type'] == 92 && $this->params['type'] == 91)) {
$save_data['type'] = $this->params['type'];
}
if (!empty($this->params['order_id'])) {
$save_data['order_id'] = $this->params['order_id'];
}
if (!empty($this->params['report_id'])) {
$save_data['report_id'] = $this->params['report_id'];
}
$save_data['id'] = $this->params['pay_id'];
$save_data['income_time'] = $this->params['income_time'];
$save_data['real_money'] = $this->params['real_money'];
$save_data['money'] = $this->params['money'];
$save_data['transaction_fee'] = $this->params['transaction_fee'];
$save_data['last_transfer_time'] = $this->params['last_transfer_time'];
$save_data['type_ext'] = empty($this->params['type_ext']) ? 0 : 1;
$save_data['received_money'] = empty($this->params['received_money']) ? 0 : $this->params['received_money'];
$save_data['type_ext'] = empty($this->params['type_ext']) ? 0 : $this->params['type_ext'];
$save_data['is_dividend'] = empty($this->params['is_dividend']) ? 0 : $this->params['is_dividend'];
$m_pay->updatePayLog($save_data);
if (isset($this->params['is_open']) && !empty($this->params['bargain_id'])) {
$this->m_bargain ->updateBargainById($this->params['bargain_id'], ['is_open'=>$this->params['is_open']]);
}
} catch (\Exception $e) {
$code = 101;
$msg = '内部错误:'. $e->getMessage();
}
return $this->response($code, $msg, []);
}
/**
* 收款列表记录上传图片
* 朱伟 2018-07-04
*/
public function addReceiptOfficeImg(){
$params = $this->params;
$result = 0;
/*$params = array(
"img_id" => 1,
"img_name" => 123,
);*/
if(!isset($params["img_id"])){
return $this->response("101","请求参数错误");
}
if(!isset($params["img_name"])){
return $this->response("101","请求参数错误");
}
$order = new OfficeOImg();
foreach (explode(',',$params["img_name"]) as $k => $v){
$time = date("Y-m-d H:i:s", time());
$save_data["img_id"] = $params["img_id"];//id根据img_type区分是收款还是进场还是其他'
$save_data["img_type"] = 2 ;//图片类型:1进场，2收款
$save_data["img_name"] = $v;//图片名称
$save_data["img_status"] = 0 ;//删除状态 0正常 1删除
$save_data["update_time"] = $time;//更新时间
$save_data["create_time"] = $time;//创建时间
$result = $order->addImgOnce($save_data);
}
if($result){
return $this->response("200","成功");
}else{
return $this->response("101","失败");
}
}
/**
* 收款列表-收款图片列表
* 朱伟 2018-07-04
*/
public function receiptOfficeImgList(){
$params = $this->params;
/*$params = array(
"id" => 6,
);*/
if(!isset($params["id"])){
return $this->response("101","请求参数错误");
}
$params['id'] = $params["id"];
$field = 'id,father_id';
//先查询收款表
$order = new OfficeOPayLogModel();
$order_res = $order->selectReceiptImgList($field , $params);
//判断收款表数据father_id是否大于o，如果大于0图片需要按img_id=father_id查询
if(!empty($order_res[0]['father_id']) && ($order_res[0]['father_id'] > 0)){
$params_img['img_id'] = $order_res[0]['father_id'];
}else{
$params_img['img_id'] = $params['id'];
}
$field = 'id,img_name';
$order = new OfficeOImg();
$res = $order->getImgList($params_img,$field);
foreach ($res as $k => $v) {
$res[$k]['img_name'] = CHAT_IMG_URL . $v['img_name'];
}
if($res){
return $this->response("200","成功",$res);
}else{
return $this->response("200","成功",$res);
}
}
/**
* 退款
*
* @return \think\Response
* @throws \think\Exception
*/
public function refundPayLog() {
$params = $this->params;
if (!isset($params["agent_id"]) || !isset($params["agent_name"]) || !isset($params["report_id"]) ||
!isset($params["order_id"]) || !isset($params["order_no"]) || !isset($params["name"]) || !isset($params["phone"])
|| !isset($params["refund_money"]) || !isset($params["bank"]) || !isset($params["card_no"])
|| !isset($params["receipt_number"]) || !isset($params["type"])
|| !isset($params["refund_cause"]) || !isset($params["refund_way"]) || empty($params["pay_log_id"])) {
return $this->response("101", "请求参数错误");
}
/* $params = array(
"agent_id" => 1,//退款经纪人id
"agent_name" => 1,//退款经纪人id
"report_id" => 1,//报备id
"order_id" => 1, //关联order表id
"order_no" => "12312312312312", //订单no
"refund_money" => 1200, //退款金额
"name" => "qweqwe", //收款人姓名
"phone" => "123123123", //收款人电话
"bank" => "asdasdasd", //收款人银行
"card_no" => "123123123123", //银行卡号
"remark" => "没什么备注", //其他说明
"remark_img" => "12312312312",
"receipt_number" => "12312312312",
"type" => "12312312312", //退款类型:0退意向金1意向金转定2退保管金3保管金转定4退中介费5退案场费
"refund_cause" => "12312312312", //退款原因
"pay_log_id" => 1, //支付id
"refund_way" => 0, //退款方式:0银行卡
);*/
$refund_id = isset($params["refund_id"]) ? $params["refund_id"] : 0;
if($refund_id == 0 && !isset($params["remark_img"])){
return $this->response("101", "请上传图片");
}
$agent_id = $params["agent_id"];
$agent_name = $params["agent_name"];
$report_id = $params["report_id"];
$order_id = $params["order_id"];
$order_no = $params["order_no"];
$refund_money = $params["refund_money"];
$name = $params["name"];
$phone = $params["phone"];
$bank = $params["bank"];
$card_no = $params["card_no"];
$receipt_number = $params["receipt_number"];
$type = $params["type"];
$refund_cause = $params["refund_cause"];
$pay_log_id = $params["pay_log_id"];
$refund_way = $params["refund_way"];
$remark = isset($params["remark"]) ? $params["remark"] : "";
$remark_img = isset($params["remark_img"]) ? $params["remark_img"] : "";
$del_img =isset($params["del_img"]) ? $params["del_img"] : "";
//todo 判断此单是否有付款
$service = new OfficePayLogService();
$is_ok = $service->addRefund($agent_id, $agent_name, $report_id, $order_id, $order_no, $refund_money, $name,
$phone, $bank, $card_no, $receipt_number, $type, $refund_cause, $pay_log_id, $refund_way, $remark, $remark_img
,$refund_id,$del_img);
if ($is_ok > 0) {
return $this->response("200", "request success", []);
} elseif ($is_ok == -2) {
return $this->response("101", "退款金不能大于剩余的支付金额");
} elseif ($is_ok == -3) {
return $this->response("101", "有财务驳回退款,请在原退款上修改.");
}
return $this->response("101", "request faild");
}
/**
* 删除收款
*
* @return \think\Response
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
*/
public function delPayLog() {
$code = 101;
$msg = '';
if (empty($this->params['pay_id'])) {
return $this->response($code, '参数错误');
}
$m_pay = new OfficeOPayLogModel();
$pay_data = $m_pay->selectPayLogByOrderNo('id,source', ['id'=>$this->params['pay_id']]);
if (empty($pay_data[0]['id'])) {
return $this->response($code, '无收款信息');
}
$m_pay_adjustment = new OfficeOPayLogAdjustment();
$where['is_del'] = 0;
if ($pay_data[0]['source'] != 2) {
$where['paylog_id'] = $pay_data[0]['id'];
} else {
$where['new_paylog_id'] = $pay_data[0]['id'];
}
$adjustment_id = $m_pay_adjustment->getAdjustmentList('id,paylog_id', $where);
if (count($adjustment_id) > 0) {
return $this->response($code, '存在调整，不能删除');
}
$m_refund = new OfficeORefundModel();
$refund_id = $m_refund->getFind('id', ['pay_log_id'=>$this->params['pay_id'],'is_del'=>0]);
if ($refund_id > 0) {
return $this->response($code, '存在退款，不能删除');
}
$num = $m_pay->updatePayLog(['is_del'=>1, 'id'=>$this->params['pay_id']]);
if ($num > 0) {
$code = 200;
} else {
$code = 101;
$msg = '删除失败';
}
return $this->response($code, $msg);
}
/**
* 撤销调整
*
* @return \think\Response
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
*/
public function delAdjustment() {
$code = 101;
if (empty($this->params['id'])) {
return $this->response($code, '参数错误');
}
$m_pay_adjustment = new OfficeOPayLogAdjustment();
$where_adjustment = [
'is_del'=>0,
'id' => $this->params['id'],
];
$new_paylog_id = $m_pay_adjustment->getFieldValue('new_paylog_id', $where_adjustment);
if (empty($new_paylog_id)) {
return $this->response($code, '无调整信息');
}
$where_2['is_del'] = $where['is_del'] = 0;
$where['paylog_id'] = $new_paylog_id;
$pay_log_id = $m_pay_adjustment->getFieldColumn('paylog_id', $where);
if (count($pay_log_id) > 0) {
return $this->response($code, '存在调整,不能删除.');
}
$m_refund = new OfficeORefundModel();
$refund_id = $m_refund->getFind('id', ['pay_log_id'=>$new_paylog_id, 'is_del'=>0]);
if ($refund_id > 0) {
return $this->response($code, '入账存在退款，不能删除');
}
$num = $m_pay_adjustment->updatePayLogAdjustment(['is_del'=>1, 'id'=>$this->params['id']]);
if ($num > 0) {
$m_pay = new OfficeOPayLogModel();
$save_data['id'] = $new_paylog_id;
$save_data['is_del'] = 1;
$m_pay->updatePayLog($save_data);
$code = 200;
$msg = '撤销成功';
} else {
$msg = '撤销失败';
}
return $this->response($code, $msg);
}
} }
\ No newline at end of file
application/index/controller/OfficeRoom.php
View file @ 968cde11
...@@ -34,6 +34,9 @@ class OfficeRoom extends Basic ...@@ -34,6 +34,9 @@ class OfficeRoom extends Basic
*/ */
public function edit() public function edit()
{ {
if (!$this->request->isAjax()) {
return view('office_room/officeEdit');
}
if ($this->request->isPost()) { if ($this->request->isPost()) {
$data = $this->service->edit($this->params, $this->userId, $this->siteId); $data = $this->service->edit($this->params, $this->userId, $this->siteId);
if ($data['status'] == 'successful') { if ($data['status'] == 'successful') {
...@@ -117,7 +120,7 @@ class OfficeRoom extends Basic ...@@ -117,7 +120,7 @@ class OfficeRoom extends Basic
public function getRoomList() public function getRoomList()
{ {
if (!$this->request->isAjax()) { if (!$this->request->isAjax()) {
return view('office/officeBuildingList'); return view('office_room/officeBuildingList');
} }
$result = $this->service->getRoomList($this->params, 1); $result = $this->service->getRoomList($this->params, 1);
if ($result['status'] == 'successful') { if ($result['status'] == 'successful') {
......
application/index/service/OfficeRoomService.php
View file @ 968cde11
...@@ -416,14 +416,9 @@ class OfficeRoomService ...@@ -416,14 +416,9 @@ class OfficeRoomService
if (empty($id['id'])) { if (empty($id['id'])) {
$data['msg'] = '没有该文件'; $data['msg'] = '没有该文件';
} else { } else {
$result = $this->m_office_img->editData(['img_status' => 1], $id['id'], 'id'); $this->m_office_img->editData(['img_status' => 1], $id['id'], 'id');
$data['status'] = 200;
if ($result) { $data['msg'] = '删除成功';
$data['status'] = 200;
$data['msg'] = '删除成功';
} else {
$data['msg'] = '删除失败';
}
} }
return $data; return $data;
...@@ -638,7 +633,7 @@ class OfficeRoomService ...@@ -638,7 +633,7 @@ class OfficeRoomService
a.is_register,a.age_limit_start,a.age_limit_end,a.rent_free,a.management_fee,a.slotting_fee,a.carport,a.enter_date, a.is_register,a.age_limit_start,a.age_limit_end,a.rent_free,a.management_fee,a.slotting_fee,a.carport,a.enter_date,
a.is_partition,a.decoration,a.payment_month,a.deposit_month,a.source,a.create_time,a.operation_id,a.landlord_remark, a.is_partition,a.decoration,a.payment_month,a.deposit_month,a.source,a.create_time,a.operation_id,a.landlord_remark,
a.fee_rule,a.update_time,b.address,a.is_exclusive_type,a.agent_start_time,a.agent_end_time,c.name as business_name, a.fee_rule,a.update_time,b.address,a.is_exclusive_type,a.agent_start_time,a.agent_end_time,c.name as business_name,
a.shop_sign,b.longitude,b.latitude,b.intro,a.is_rent'; a.shop_sign,b.longitude,b.latitude,b.intro,a.is_rent,a.room_number,a.is_show';
$result = $this->m_office_room->getOfficeRoomInfo($field,['a.id'=>$id]); $result = $this->m_office_room->getOfficeRoomInfo($field,['a.id'=>$id]);
if (!$result) { if (!$result) {
...@@ -655,7 +650,9 @@ class OfficeRoomService ...@@ -655,7 +650,9 @@ class OfficeRoomService
//上传人 //上传人
$result['upload_info'] = $this->getUploadInfo($result['operation_id']); $result['upload_info'] = $this->getUploadInfo($result['operation_id']);
//独家方 //独家方
$result['exclusive_info'] = $this->getExclusiveInfo($result['id']); $result['exclusive_info'] = $this->getExclusiveInfo($result['id'],3);
//盘方
$result['room_relegation_info'] = $this->getExclusiveInfo($result['id'],2);
//房东 //房东
$result['landlord_info'] = $this->getLandlordInfo($result['id']); $result['landlord_info'] = $this->getLandlordInfo($result['id']);
//房源数 //房源数
...@@ -783,10 +780,10 @@ class OfficeRoomService ...@@ -783,10 +780,10 @@ class OfficeRoomService
} }
//获取独家方 //获取独家方
public function getExclusiveInfo($house_id){ public function getExclusiveInfo($house_id,$type=3){
$exclusive_info = []; $exclusive_info = [];
$params['house_id'] = $house_id; $params['house_id'] = $house_id;
$params['type'] = 3; $params['type'] = $type;
$params['is_del'] = 0; $params['is_del'] = 0;
$res = $this->agent_room->getAgentsByRoomId('b.id,name,a.type,b.phone', $params); $res = $this->agent_room->getAgentsByRoomId('b.id,name,a.type,b.phone', $params);
if($res){ if($res){
...@@ -1254,7 +1251,7 @@ class OfficeRoomService ...@@ -1254,7 +1251,7 @@ class OfficeRoomService
$order = 'a.home_page_sort desc'; $order = 'a.home_page_sort desc';
} }
$field = 'a.id,b.disc,b.title,b.address,c.name as business_name,a.building_id,a.price,a.price_total'; $field = 'a.id,b.disc,b.title,b.address,c.name as business_name,a.building_id,a.price,a.price_total,b.status';
try { try {
$data = $this->m_office_room->getRoomBuilding($page_no, $page_size, $order, $field, $where); $data = $this->m_office_room->getRoomBuilding($page_no, $page_size, $order, $field, $where);
} catch (\Exception $e) { } catch (\Exception $e) {
......
application/index/service/OfficeUserLogService.php
View file @ 968cde11
...@@ -4,6 +4,7 @@ namespace app\index\service; ...@@ -4,6 +4,7 @@ namespace app\index\service;
use app\api_broker\service\CallPhoneService; use app\api_broker\service\CallPhoneService;
use app\api_broker\service\ClientService; use app\api_broker\service\ClientService;
use app\api_broker\service\OfficeOrderLogService;
use app\api_broker\service\OrderLogService; use app\api_broker\service\OrderLogService;
use app\api_broker\service\RedisCacheService; use app\api_broker\service\RedisCacheService;
use app\api_broker\service\VipService; use app\api_broker\service\VipService;
...@@ -33,7 +34,7 @@ class OfficeUserLogService ...@@ -33,7 +34,7 @@ class OfficeUserLogService
{ {
$this->agentModel = new AAgents(); $this->agentModel = new AAgents();
$this->userModel = new Users(); $this->userModel = new Users();
$this->orderService = new OrderLogService(); $this->orderService = new OfficeOrderLogService();
} }
...@@ -86,4 +87,36 @@ class OfficeUserLogService ...@@ -86,4 +87,36 @@ class OfficeUserLogService
} }
/**
* 客户动态
* @param $user_id
* @param $site_id
* @param $type 1表示查最近的一条跟进，2查所有的订单更近
* @return false|mixed|null|\PDOStatement|string|\think\Collection
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
*/
public function userLog($user_id, $site_id, $type)
{
$result = $this->orderService->selectListByUserIdAndSiteId($user_id, '', $site_id);
switch ($type){
case 1:
if(count($result) > 0){
return $result[0];
}else{
return null;
}
case 2:
return $result;
default:
return null;
break;
}
}
} }
\ No newline at end of file
application/index/view/office/officeBuildingList.html → application/index/view/office_room/officeBuildingList.html
View file @ 968cde11
...@@ -238,7 +238,7 @@ ...@@ -238,7 +238,7 @@
<div class="pull-right"> <div class="pull-right">
<ul class="bread_btn"> <ul class="bread_btn">
<li> <li>
<a href="/admin.php/index/officeEdit" class="btn btn-default"><i class="icon-plus"></i>新增办公楼</a> <a href="/admin.php/office_index/houseAdd" class="btn btn-default"><i class="icon-plus"></i>新增办公楼</a>
</li> </li>
</ul> </ul>
</div> </div>
......
application/index/view/office_room/officeEdit.html 0 → 100644
View file @ 968cde11
{layout name="global/frame_two_tpl" /}
<input type="hidden" class="page-load" id="officeEdit" />
<style>
.half{
width:50%!important;
}
.p-t-10{
margin-top:10px;
}
.upload-image-btn{
width: 82px;
height: 40px;
position: relative;
opacity: 0;
z-index: 66;
}
.btn-default-liu{
position: relative;
left: -80px;
z-index: 6;
}
</style>
<!--默认#page-content-wrapper是隐藏的-->
<div id="page-content-wrapper" style="display: none;">
<div class="container">
<div class="row">
<div class="">
<div class="panel panel-default">
<div class="panel-heading">新增/编辑办公楼</div>
<div class="panel-body">
<form class="form-inline" id="main_form">
<ul class="list-group">
<li class="list-group-item" id="li_loupan">
<div class="form-group phone-list-container" style="width: 70px;">
<label for="">所属楼盘</label>
</div>
<div class="form-group phone-list-container" id="loupan">
<input type="text" class="form-control phone_loupan" placeholder="请输入">
<ul></ul>
</div>
</li>
<li class="list-group-item isHideLoupan" >
<div class="form-group">
<label for="shangpuType">楼盘地址：</label>
<span class="address-list"></span>
</div>
<div class="form-group">
<label for="show_all">所属商圈：</label>
<span class="business_name-list"></span>
</div>
<div class="form-group">
<label for="exclusiveType">总层数：</label>
<span class="floor_total-list"></span>
</div>
<div class="form-group">
<label for="exclusiveType">类型：</label>
<span class="type-list"></span>
</div>
<div class="form-group">
<label for="exclusiveType">交通：</label>
<span class="traffic-list"></span>
</div>
<div class="form-group">
<label for="exclusiveType">简介：</label>
<span class="intro-list"></span>
</div>
<br />
<div class="form-group text-danger">
<label for="exclusiveType">如果以上楼盘信息不对，请联系店长在电脑端编辑楼盘字典</label>
</div>
</li>
<li class="list-group-item">
<div class="form-group">
<label for="shangpuType">房源状态</label>
<select class="form-control" name="" id="is_rent" data-alert="请选择房源状态">
<option value="">请选择</option>
<option value="1">已租</option>
<option value="0">求租</option>
</select>
</div>
<!--<div class="form-group">-->
<!--新增时 不显示是否对客户展示-->
<div class="form-group isShowuser">
<label for="show_all">是否对客户展示</label>
<select class="form-control" name="showCd" id="showCd" disabled="disabled">
<option value="">请选择</option>
<option value="0">是</option>
<option value="1">否</option>
</select>
</div>
<div class="form-group">
<label for="exclusiveType">是否独家</label>
<select class="form-control" name="exclusiveType" id="exclusiveType" data-alert="请选择是否独家">
<option value="">请选择</option>
<option value="0">否</option>
<option value="1">是</option>
</select>
</div>
<div class="form-group">
<label for="exclusiveType">来源</label>
<select class="form-control" name="exclusiveType" id="laiyuan" data-alert="请选择来源">
<option value="-1">请选择</option>
<option value="0">无</option>
<option value="1">网络</option>
<option value="2">客户介绍</option>
<option value="3">朋友介绍</option>
<option value="4">上门挂牌</option>
<option value="5">打跟进</option>
<option value="6">驻守</option>
<option value="7">其它</option>
</select>
</div>
</li>
<!-- 案场人电话添加多个手机号-->
<!--<li class="list-group-item" id="li_acr_phone">
<div class="form-group phone-list-container" style="width: 70px;">
<label for="">案场人电话</label>
</div>
<div class="form-group phone-list-container">
<input type="tel" class="form-control phone_jia" placeholder="请输入">
<ul></ul>
</div>
<img src="/resource/image/jia2@2x.png" data-hideid='1' class="input-add-tel" id="acr_tel_jia" />
</li>-->
<li class="list-group-item" id="li_pf_phone">
<div class="form-group phone-list-container" style="width: 70px;">
<label for="">盘方</label>
</div>
<div class="form-group phone-list-container panfang">
<input type="tel" class="form-control phone_jia" placeholder="请输入" id="panfang_data">
<ul></ul>
</div>
<img src="/resource/image/jia2@2x.png" data-hideid='0' class="input-add-tel" id="pf_tel_jia" />
</li>
<li class="list-group-item" id="li_acqx_phone">
<div class="form-group phone-list-container" style="width: 70px;">
<label for="">案场权限人</label>
</div>
<div class="form-group phone-list-container anchang ">
<input type="tel" class="form-control phone_jia" placeholder="请输入">
<ul></ul>
</div>
<img src="/resource/image/jia2@2x.png" data-hideid='0' class="input-add-tel" id="acqx_tel_jia" />
</li>
<li class="list-group-item" style="overflow: hidden;">
<div class="col-xs-12 form-group">
<div class="col-xs-4 p-t-10">
<label >租金总价:</label>
<input type="number" class="form-control input-100-width" id="price_total" placeholder="请输入" data-alert="请输入租金总价！">&nbsp;&nbsp;元/月
</div>
<div class="col-xs-4 p-t-10">
<label class="">租金单价: </label>
<input type="number" class="form-control input-100-width" id="price_single" placeholder="请输入" data-alert="请输入租金单价！">&nbsp;&nbsp;元/m²/天
</div>
<div class="col-xs-4 p-t-10">
<label class="">转让费: </label>
<input type="number" class="form-control input-100-width" id="slotting_fee" placeholder="请输入" data-alert="请填写转让费！">元
<!--</div>-->
</div>
<div class="col-xs-4 p-t-10">
<label for="">免租时间</label>
<label class="checkbox-inline">
<input type="checkbox" id="foreignZhuanrangFace" value="面议">面议
</label>
<input type="number" class="form-control input-100-width" id="foreignZhuanrangPrice" placeholder="请输入" data-alert="请填写免租时间！">月
</div>
<div class="col-xs-4 p-t-10">
<label class="">物业管理费: </label>
<input type="number" class="form-control input-100-width" id="management_fee" placeholder="请输入" data-alert="请输入物业管理费！">&nbsp;&nbsp;元/m²/月
</div>
<div class="col-xs-4 p-t-10">
<label class="">可容纳工位: </label>
<input type="number" class="form-control" style="width: 100px!important;" id="station_start" placeholder="请输入" data-alert="请输入可容纳工位！">
-
<input type="number" class="form-control" style="width: 100px!important;" id="station_end" placeholder="请输入" data-alert="请输入可容纳工位！">
</div>
<div class="col-xs-4 p-t-10">
<label class="">面积: </label>
<input type="number" class="form-control input-100-width" id="area" placeholder="请输入" data-alert="请输入面积！">&nbsp;&nbsp;m²
</div>
<div class="col-xs-4 p-t-10">
<label class="">所在楼层: </label>
<input type="number" class="form-control input-100-width" id="floor" placeholder="请输入" data-alert="请输入楼层！">&nbsp;&nbsp;楼
</div>
<div class="col-xs-4 p-t-10">
<label class="">房号: </label>
<input type="number" class="form-control input-100-width" id="room_number" placeholder="请输入" data-alert="请输入房号！">&nbsp;&nbsp;
</div>
<div class="col-xs-4 p-t-10">
<label class="">所属楼层 :</label>
<select class="form-control input-100-width" name="dianya" id="floor_tag" data-alert="请选择所属楼层">
<option value="">请选择</option>
<option value="1">底层</option>
<option value="2">中层</option>
<option value="3">高层</option>
</select>
</div>
<div class="col-xs-4 p-t-10">
<label for="shangpuType">付款规则</label>
<span>付</span>
<select class="form-control" name="guizeFu" id="guizeFu" data-alert="请选择付款规则付多少">
<option value="">请选择</option>
<option value="1">1</option>
<option value="2">2</option>
<option value="3">3</option>
<option value="4">4</option>
<option value="5">5</option>
<option value="6">6</option>
<option value="7">7</option>
<option value="8">8</option>
<option value="9">9</option>
<option value="10">10</option>
<option value="11">11</option>
<option value="12">12</option>
</select>
<span>押</span>
<select class="form-control" name="guizeYa" id="guizeYa" data-alert="请选择付款规则押多少">
<option value="">请选择</option>
<option value="1">1</option>
<option value="2">2</option>
<option value="3">3</option>
<option value="4">4</option>
<option value="5">5</option>
<option value="6">6</option>
<option value="7">7</option>
<option value="8">8</option>
<option value="9">9</option>
<option value="10">10</option>
<option value="11">11</option>
<option value="12">12</option>
</select>
</div>
<div class="col-xs-4 p-t-10">
<label class="">签约年限: </label>
<input type="number" class="form-control" style="width: 100px!important;" id="qianyueNianxian" placeholder="请输入" data-alert="请输入签约年限！">
-
<input type="number" class="form-control" style="width: 100px!important;" id="qianyueNianxian2" placeholder="请输入" data-alert="请输入签约年限！">年
</div>
<div class="col-xs-4 p-t-10">
<label class="">可注册公司: </label>
<select class=" form-control input-100-width" id="is_register" data-alert="请选择注册公司！">
<option value="" selected="selected">请选择</option>
<option value="0">是</option>
<option value="1">否</option>
</select>
</div>
<div class="col-xs-4 p-t-10" >
<label class="">是否可分割: </label>
<select class=" form-control input-100-width" id="is_partition" data-alert="请选择是否可分割！">
<option value="" selected="selected">请选择</option>
<option value="0">是</option>
<option value="1">否</option>
</select>
</div>
<div class="col-xs-4 p-t-10">
<label class="">车位情况: </label>
<input type="text" class="form-control input-100-width" id="carport" placeholder="请输入" data-alert="请输入车位情况！">&nbsp;&nbsp;
</div>
<div class="col-xs-4 p-t-10">
<label class="">交付装修 :</label>
<select class=" form-control input-100-width" id="zuhangxiu" data-alert="请选择交付装修！">
<option value="" selected="selected">请选择</option>
<option value="1">毛胚</option>
<option value="2">现状</option>
<option value="3">简单装修</option>
<option value="4">精装修</option>
</select>
</div>
<div class="col-xs-4 p-t-10">
<label class="">佣金规则: </label>
<input type="text" class="form-control" id="fee_rule" placeholder="请输入" data-alert="请输入佣金规则！" style="width: 200px;">&nbsp;&nbsp;
</div>
<div class="col-xs-4 p-t-10">
<label class="">入驻时间: </label>
<input type="date" class="form-control" id="enter_date" placeholder="请输入" data-alert="请输入入驻时间！" style="width: 150px;">&nbsp;&nbsp;
</div>
</div>
</li>
<li class="list-group-item" id="shangpu_tags_area">
<label for="">办公楼标签(可多选)</label>
</li>
<li class="list-group-item">
<div class="form-group" id="li_landlord_phone_input">
<label>房东称呼和手机号</label>
<div class="landlord-form-group">
<div class="form-group phone-list-container">
<input type="text" class="form-control landlord-name-input" placeholder="请输入房东称呼" />
<input type="tel" class="form-control landlord-phone-input" placeholder="请输入房东手机号" name="landlordPhone" id="landlordPhone" data-alert="请填写房东手机号！">
</div>
</div>
<img src="/resource/image/jia2@2x.png" class="input-add-tel-landlord" id="landlord_tel_jia" />
</div>
</li>
<li class="list-group-item">
<div class="form-group">
<label>房东备注：(选填)</label>
<input type="text" id="landlord_remark" class="form-control" style="width: 300px;"/>
</div>
</li>
<li class="list-group-item">
<div class="form-group full-width-100 full-pic-area">
<label for="">室内详情图(至少2张)</label>
<input readonly="readonly" type="text" name="xiangqing_pic_input" class="form-control" style="display: none" id="xiangqing_pic_input" placeholder="请选择图片">
<input class="upload-image-btn" id="xiangqing_pic_btn" type="file" data-limittop="20" style="display: inline-block;">
<button class="btn btn-default btn-default-liu">选择图片</button>
<span class="tip"></span>
<!--<label for="isShowShopDetail">是否对客户展示对内详情图</label>
<select class="form-control" name="isShowShopDetail" id="isShowShopDetail" data-alert="请选择是否对客户展示对内详情图">
<option value="-1">请选择</option>
<option value="1">是</option>
<option value="0">否</option>
</select>-->
</div>
<ul class="img-pre-ul" id="xiangqing_pic_ul"></ul>
</li>
<!--<li class="list-group-item">
<div class="form-group full-width-100 full-pic-area">
<label for="">楼层平面图(选填)</label>
<input readonly="readonly" type="text" name="louceng_pic_input" class="form-control" style="display: none" id="louceng_pic_input" placeholder="请选择图片">
<input readonly="readonly" class="upload-image-btn" id="louceng_pic_btn" type="file" data-limittop="20" style="display: inline-block;">
<button class="btn btn-default btn-default-liu">选择图片</button>
<span class="tip"></span>
</div>
<ul class="img-pre-ul" id="louceng_pic_ul"></ul>
</li>-->
<!--<li class="list-group-item">
<div class="form-group full-width-100 full-pic-area">
<label for="">附件上传(pdf格式，选填，1个)</label>
<input readonly="readonly" type="text" name="fujian_pre" class="form-control" style="display: none" id="fujian_pre" placeholder="请选择图片">
<input class="upload-image-btn" id="fujian_btn" type="file" data-limittop="1" data-spfile="pdf" style="display: inline-block;">
<button class="btn btn-default btn-default-liu">选择附件</button>
<span class="tip"></span>
</div>
<ul class="img-pre-ul" id="fujian_ul"></ul>
</li>-->
<li class="list-group-item li_dujia_area">
<div class="form-group">
<label for="">独家代理有效期</label>
<div class="input-group">
<input type="date" class="form-control" id="exclusiveDate1" data-alert="请填写独家代理有效期开始时间！" placeholder="请输入">
<div class="input-group-addon">至</div>
<input type="date" class="form-control" id="exclusiveDate2" data-alert="请填写独家代理有效期结束时间！" placeholder="请输入">
</div>
</div>
<div class="form-group phone-list-container" style="width: 45px;margin-right: 0;">
<label for="">独家方</label>
</div>
<div class="form-group phone-list-container">
<input type="tel" class="form-control phone_jia" id="exclusiveTel" data-alert="请填写独家方！" placeholder="请输入">
<ul></ul>
</div>
</li>
<li class="list-group-item li_dujia_area">
<div class="form-group full-width-100 full-pic-area">
<label for="">独家合同上传</label>
<input readonly="readonly" type="text" name="dujia_pic_input" class="form-control" style="display: none" id="dujia_pic_input" placeholder="请选择图片">
<input class="upload-image-btn" id="dujia_pic_btn" type="file" data-limittop="20" style="display: inline-block;">
<button class="btn btn-default btn-default-liu">选择图片</button>
<span class="tip"></span>
</div>
<ul class="img-pre-ul" id="dujia_pic_ul"></ul>
</li>
<li class="list-group-item" style="text-align: center;"><button type="submit" class="btn btn-primary" id="saveBtn">保存</button></li>
</ul>
</form>
</div>
</div>
</div>
</div>
</div>
<!--百度定位的弹出框更改-->
<div class="modal fade bs-example-modal-lg" tabindex="-1" role="dialog" aria-labelledby="myLargeModalLabel">
<div class="modal-dialog modal-lg" role="document">
<div class="modal-content" style="width: 780px;">
<div class="modal-header address-search-head-div">
<div class="address-header-bar">
<div id="address_city_title">上海市</div>
<div class="crile">
<input class="main-input" id="search_input" type="search" placeholder="请输入地址" />
<img src="/resource/image/search_gb.png" class="cancel-pic" />
</div>
</div>
<button type="button" class="close" data-dismiss="modal" aria-label="Close" style="font-size: 42px;"><span aria-hidden="true">×</span></button>
</div>
<div class="modal-body" style="height: 780px;">
<div id="position_box">
<div id="main_ul">
<ul></ul>
</div>
<div id="loading_pic" class="loading_pic">
<img src="/resource/image/jz2.gif" />
<p>正在加载...</p>
</div>
<div id="no_more" class="no_more">没有更多了</div>
</div>
</div>
</div>
</div>
</div>
<script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=RTimRTxtj23AYTCkSsPvNDuQkGpR2fPX"></script>
<!--图片点击查看大图-->
<div id="img_mask_area" title="点击任意位置可关闭">
<img />
</div>
<!--整夜页面的加载图标区域-->
<div id="main_loading_pic">
<img src="/resource/image/jz2.gif" />
</div>
</div>
<script id="my_tpl_landlord_phone1" type="text/template">
<div class="form-group phone-list-container">
<input type="text" class="form-control landlord-name-input" value="{name}" placeholder="请输入房东称呼" />
<input type="tel" class="form-control landlord-phone-input" value="{phone}" placeholder="请输入房东手机号" data-id="{id}" name="landlordPhone" data-alert="请填写房东手机号！">
<img src="/resource/image/search_gb.png" class="input-cancel-pic"></div>
</div>
</script>
\ No newline at end of file
application/route.php
View file @ 968cde11
...@@ -365,7 +365,7 @@ Route::group('index', [ ...@@ -365,7 +365,7 @@ Route::group('index', [
'dayAchievementsReport' => ['index/PerformanceReport/dayAchievementsReportList', ['method' => 'POST|GET']],//日报liu 'dayAchievementsReport' => ['index/PerformanceReport/dayAchievementsReportList', ['method' => 'POST|GET']],//日报liu
'weekAchievementsReport' => ['index/PerformanceReport/weekAchievementsReportList', ['method' => 'POST|GET']],//周报liu 'weekAchievementsReport' => ['index/PerformanceReport/weekAchievementsReportList', ['method' => 'POST|GET']],//周报liu
'officeBuildingList' => ['index/OfficeBuilding/officeBuildingList', ['method' => 'POST|GET']],//办公楼liu 'officeBuildingList' => ['index/OfficeBuilding/officeBuildingList', ['method' => 'POST|GET']],//办公楼liu
'officeEdit' => ['index/OfficeBuilding/officeEdit', ['method' => 'POST|GET']],//办公楼新增编辑liu // 'officeEdit' => ['index/OfficeBuilding/officeEdit', ['method' => 'POST|GET']],//办公楼新增编辑liu
'buildingDictionary' => ['index/OfficeBuilding/buildingDictionary', ['method' => 'POST|GET']],//楼盘字典liu 'buildingDictionary' => ['index/OfficeBuilding/buildingDictionary', ['method' => 'POST|GET']],//楼盘字典liu
...@@ -1042,8 +1042,14 @@ Route::group('office_index', [ ...@@ -1042,8 +1042,14 @@ Route::group('office_index', [
'del' => ['index/OfficeRoom/del', ['method' => 'POST']], //设置无效房源 'del' => ['index/OfficeRoom/del', ['method' => 'POST']], //设置无效房源
'isShow' => ['index/OfficeRoom/isShow', ['method' => 'POST']],//是否对C端显示 'isShow' => ['index/OfficeRoom/isShow', ['method' => 'POST']],//是否对C端显示
'followUpList' => ['index/OfficeRemark/followUpList', ['method' => 'POST|GET']], 'followUpList' => ['index/OfficeRemark/followUpList', ['method' => 'POST|GET']],
'addReceiptImg' => ['index/Finance/addReceiptOfficeImg', ['method' => 'post|get']],//收款图片信息保存 'addReceiptImg' => ['index/officePayLog/addReceiptOfficeImg', ['method' => 'post|get']],//收款图片信息保存
'getPayLogImg' => ['index/DailyPaper/getPayLogOfficeImg', ['method' => 'get|post']], 'getPayLogImg' => ['index/DailyPaper/getPayLogOfficeImg', ['method' => 'get|post']],
'receiptImgList' => ['index/officePayLog/receiptOfficeImgList', ['method' => 'post|get']],//收款列表-收款图片列表
'getCollectionEdit' => ['index/officePayLog/getCollectionEdit', ['method' => 'post']],//收款修改保存
'refundPayLog' => ['index/officePayLog/refundPayLog', ['method' => 'POST']],//退款
'delPayLog' => ['index/officePayLog/delPayLog', ['method' => 'POST']],//删除收款
'delAdjustment' => ['index/officePayLog/delAdjustment', ['method' => 'post']],//撤销调整
]); ]);
Route::group('office_api', [ Route::group('office_api', [
......
public/resource/template/office_building_list_template_tpl.html
View file @ 968cde11
...@@ -81,11 +81,11 @@ ...@@ -81,11 +81,11 @@
[% if(it[item]["is_vip"] == 1) { %] [% if(it[item]["is_vip"] == 1) { %]
[% if (check_auth('index/vipHouse') || it[item]['auth_edit_house']) { %] [% if (check_auth('index/vipHouse') || it[item]['auth_edit_house']) { %]
<a class="btn1 btn-success" href="/admin.php/index/officeEdit?id=[%= it[item]['id']%]" >编辑</a> <a class="btn1 btn-success" href="/admin.php/office_index/houseEdit?id=[%= it[item]['id']%]" >编辑</a>
[% } %] [% } %]
[% }else{ %] [% }else{ %]
[% if(it[item]['auth_edit_house'] || check_auth('index/houseEdit')) { %] [% if(it[item]['auth_edit_house'] || check_auth('index/houseEdit')) { %]
<a class="btn1 btn-success" href="/admin.php/index/officeEdit?id=[%= it[item]['id']%]" >编辑</a> <a class="btn1 btn-success" href="/admin.php/office_index/houseEdit?id=[%= it[item]['id']%]" >编辑</a>
[% } %] [% } %]
[% } %] [% } %]
......
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