Skip to content

T
tl_estate
Commit 7f251b85 authored by hujun's avatar hujun
Browse files
Options

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

parents 8ad9be28 138c5b5b
Hide whitespace changes
Inline Side-by-side
Showing with 228 additions and 64 deletions
application/api_broker/controller/OrderLog.php
View file @ 7f251b85
......@@ -160,25 +160,25 @@ class OrderLog extends Basic
!isset($params["price"]) || !isset($params["commission"]) || !isset($params["commission_arr"])) {
return $this->response("101", "请求参数错误");
}
/* $params = array(
"submit_agent_id" => 1,//申请经纪人id
"submit_agent_name" => 1,//申请经纪人id
"report_id" => 1,//报备id
"order_id" => 1, //关联order表id
"order_no" => "123123123", //订单no
"trade_type" => 10, //成交类型 10出租 20 增佣 30 代理 40 好处费
"price" => 112131, //成交价格 存分
"commission" => 111, //佣金 存分
//`role` '分佣方 1盘方 2客方 3 反签 4独家 5合作方',
//`agent_id`'分佣经纪人id',
//`scale`'分佣比例 如 5表示百分之5',
// `scale_fee` '应分佣金 存分 ',
"commission_arr" => '[ { "role" : 10, "agent_id" : 10, "scale" : 10, "scale_fee" : 1222 },
{ "role": 11, "agent_id" : 12, "scale": 13, "scale_fee" : 1112 }]',
);*/
/* $params = array(
"submit_agent_id" => 1,//申请经纪人id
"submit_agent_name" => 1,//申请经纪人id
"report_id" => 1,//报备id
"order_id" => 1, //关联order表id
"order_no" => "123123123", //订单no
"trade_type" => 10, //成交类型 10出租 20 增佣 30 代理 40 好处费
"price" => 112131, //成交价格 存分
"commission" => 111, //佣金 存分
//`role` '分佣方 1盘方 2客方 3 反签 4独家 5合作方',
//`agent_id`'分佣经纪人id',
//`scale`'分佣比例 如 5表示百分之5',
// `scale_fee` '应分佣金 存分 ',
"commission_arr" => '[ { "role" : 10, "agent_id" : 10, "scale" : 10, "scale_fee" : 1222 },
{ "role": 11, "agent_id" : 12, "scale": 13, "scale_fee" : 1112 }]',
);*/
$params["commission_arr"] = json_decode($params["commission_arr"], true);
......@@ -536,18 +536,29 @@ class OrderLog extends Basic
}
}
/**
* 店铺动态
* @return \think\Response
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
*/
public function getListByHouseId(){
public function getListByHouseId()
{
$params = $this->params;
/* $params = array(
"house_id"=>1
);*/
/* $params = array(
"house_id"=>1
);*/
if (!isset($params["house_id"])) {
return $this->response("101", "请求参数错误");
}
$data = $this->service_->selectListByHouseId($params["house_id"]);
return $this->response("200","request success",$data);
if (count($data) > 0) {
return $this->response("200", "request success", $data);
} else {
return $this->response("200", "request null");
}
}
}
\ No newline at end of file
application/api_broker/controller/Shop.php
View file @ 7f251b85
......@@ -6,6 +6,7 @@ use app\api_broker\extend\Basic;
use app\api_broker\service\VerifyService;
use app\model\AttentionModel;
use app\model\GHouses;
use app\model\GHousesFollowUp;
use app\model\GHousesImgs;
use app\model\Regions;
......@@ -416,4 +417,33 @@ class Shop extends Basic
$data = $regions->getRegions($this->params['code'], $this->params['parent_code']);
return $this->response(200, '', $data);
}
/**
* 新增店铺跟进
* @return \think\Response
*/
public function addShopFollowUp(){
$params = $this->params;
/* $params = array(
"house_id" => 1,
"follow_up_info"=>"123123131",
"agent_id"=>1,
"agent_name"=>"2324",
"agent_phone"=>"13766166616",
);*/
if(!isset($params["house_id"]) || !isset($params["follow_up_info"])|| !isset($params["agent_id"])
|| !isset($params["agent_name"])|| !isset($params["agent_phone"])){
return $this->response("101", "请求参数错误");
}
$follow_up_model = new GHousesFollowUp();
$id = $follow_up_model->addHousesFollowUp($params);
if($id > 0 ){
return $this->response("200","request success",["id"=>$id]);
}else{
return $this->response("200","request error");
}
}
}
application/api_broker/service/OrderLogService.php
View file @ 7f251b85
......@@ -5,6 +5,7 @@ namespace app\api_broker\service;
use app\api\untils\GeTuiUntils;
use app\model\AAgents;
use app\model\FollowUpLogModel;
use app\model\GHousesFollowUp;
use app\model\GHousesToAgents;
use app\model\OBargainModel;
use app\model\OMarchInModel;
......@@ -440,7 +441,10 @@ class OrderLogService
/**
* 查询流程 商铺动态
* @param $house_id
* @return array
* @return mixed
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
*/
public function selectListByHouseId($house_id)
{
......@@ -448,12 +452,14 @@ class OrderLogService
$sort = 0;
//todo 1.验证订单是否存在
$oReportModel = new OReportModel();
$oMarchInModel = new OMarchInModel();
$followUpLogModel = new FollowUpLogModel();
$oPayLogModel = new OPayLogModel();
$oRefundModel = new ORefundModel();
$oBargainModel = new OBargainModel();
$oReportModel = new OReportModel();
$oMarchInModel = new OMarchInModel();
$followUpLogModel = new FollowUpLogModel();
$oPayLogModel = new OPayLogModel();
$oRefundModel = new ORefundModel();
$oBargainModel = new OBargainModel();
$gHousesFollowModel = new GHousesFollowUp();
$field_report = "a.id,a.create_time,a.user_name,a.user_phone,b.id as order_id,b.house_title,c.id as agent_id,c.name,c.img,d.store_name";
......@@ -462,20 +468,26 @@ class OrderLogService
return [];
}
$order_ids = $report_ids = "";
$order_ids = $report_ids = "";
$user_info_arr = [];
//报备
foreach ($reportData as $k => $v) {
$v["user_phone"] = preg_replace('/(\d{3})\d{4}(\d{4})/', '$1****$2', $v["user_phone"]);
$v["step_name"] = "report";
$v["step"] = "报备【" . $v['user_name'] . "- " . $v["user_phone"] . "】";
$v["step"] = "报备【" . $v['user_name'] . "-" . $v["user_phone"] . "】";
$result[$sort++] = $v;
$order_ids .= $v["order_id"] . ",";
$report_ids .= $v["id"] . ",";
$order_ids .= $v["order_id"] . ",";
$report_ids .= $v["id"] . ",";
//todo 组装成order_id为key的数组
$user_info_arr[$v["order_id"]] = $v;
}
$order_ids = rtrim($order_ids, ",");
$report_ids = rtrim($report_ids, ",");
$order_ids = rtrim($order_ids, ",");
$report_ids = rtrim($report_ids, ",");
$orderParams["order_id"] = array( "in", $order_ids );
$reportParams["report_id"] = array( "in", $report_ids );
......@@ -485,24 +497,25 @@ class OrderLogService
if (count($marchInData) > 0) {
foreach ($marchInData as $k => $v) {
$v["step_name"] = "march_in";
$v["step"] = "进场【" . $v['house_title'] . "】";
$v["step"] = "进场【" . $user_info_arr[$v['order_id']]['user_name'] . "-" . $user_info_arr[$v['order_id']]["user_phone"] . "】";
$result[$sort++] = $v;
}
}
//跟进
$field_follow_up = "a.id,a.agent_id,a.agent_name,a.user_type,a.decision_maker,a.industry_type,a.area_requirement,a.price_requirement,a.province,a.city,
a.district,a.business_area,a.explain,a.explain_img,a.create_time,b.name,b.img,c.store_name";
a.district,a.business_area,a.explain,a.explain_img,a.create_time,b.name,b.img,c.store_name,d.user_name,d.user_phone";
$followUpLogData = $followUpLogModel->getFollowUpByOrderId($field_follow_up, $reportParams);
if (count($followUpLogData) > 0) {
foreach ($followUpLogData as $k => $v) {
$v["step_name"] = "follow_up_log";
$v["step"] = "跟进";
$v = $this->convertFollowUp($v);
$v["img_path"] = CHAT_IMG_URL;
$v["explain_img"] = $v["explain_img"];
$result[$sort++] = $v;
$v["step_name"] = "follow_up_log";
$v["user_phone"] = preg_replace('/(\d{3})\d{4}(\d{4})/', '$1****$2', $v["user_phone"]);
$v["step"] = "报备跟进【" . $v['user_name'] . "-" . $v['user_phone'] . "】";
$v = $this->convertFollowUp($v);
$v["img_path"] = CHAT_IMG_URL;
$result[$sort++] = $v;
}
}
......@@ -512,7 +525,7 @@ class OrderLogService
if (count($payLogData) > 0) {
foreach ($payLogData as $k => $v) {
$v["step_name"] = "pay_log";
$v["step"] = "收款【" . $v['house_title'] . "】";
$v["step"] = "收款【" . $user_info_arr[$v['order_id']]['user_name'] . "-" . $user_info_arr[$v['order_id']]["user_phone"] . "】";
$result[$sort++] = $v;
}
}
......@@ -525,7 +538,7 @@ class OrderLogService
if (count($refundData) > 0) {
foreach ($refundData as $k => $v) {
$v["step_name"] = "refund";
$v["step"] = "退款【" . $v['house_title'] . "】";
$v["step"] = "退款【" . $user_info_arr[$v['order_id']]['user_name'] . "-" . $user_info_arr[$v['order_id']]["user_phone"] . "】";
$result[$sort++] = $v;
}
}
......@@ -536,7 +549,18 @@ class OrderLogService
if (count($bargainData) > 0) {
foreach ($bargainData as $k => $v) {
$v["step_name"] = "bargain";
$v["step"] = "成交报告【" . $v['house_title'] . "】";
$v["step"] = "成交报告【" . $user_info_arr[$v['order_id']]['user_name'] . "-" . $user_info_arr[$v['order_id']]["user_phone"] . "】";
$result[$sort++] = $v;
}
}
//楼盘跟进
$field_shop_follow_up = "a.id,a.follow_up_info,a.agent_id,a.create_time,b.name as agent_name,b.img,c.store_name";
$houseFollowUpData = $gHousesFollowModel->getShopFollowUpList($field_shop_follow_up, [ "house_id" => $house_id ]);
if (count($houseFollowUpData) > 0) {
foreach ($houseFollowUpData as $k => $v) {
$v["step_name"] = "shop_follow_up";
$v["step"] = "跟进：" . $v["follow_up_info"];
$result[$sort++] = $v;
}
}
......
application/app_broker/view/index/daily_achieve_dz.html
View file @ 7f251b85
......@@ -128,13 +128,13 @@
<td>分数</td>
<td>点评</td>
</tr>
<!--<tr>
<td>刘丹丹</td>
<td><input type="number" placeholder="填写" /></td>
<td>
<div class="div-textarea" contenteditable="true">点击填写</div>
</td>
</tr>-->
<tr v-for="(item, index) in peopleList" data-id="item.agent_id">
<td>{{item.agent_name}}</td>
<td><input type="number" placeholder="填写" /></td>
<td>
<div class="div-textarea" contenteditable="true">点击填写</div>
</td>
</tr>
<tr class="table-tr-textarea tr-padding20">
<td>绩效奖惩的<br />执行情况</td>
<td colspan="2">
......
application/index/view/member/users_list.html
View file @ 7f251b85
......@@ -50,15 +50,24 @@
}
.phone_list{
margin-top: 32px;
width: 182px;
margin-left: -182px;
}
.phone_jia{
width: 182px;
}
.phone_list li{
height: 25px;
line-height: 25px;
height: 22px;
line-height: 22px;
}
.phone_list li:nth-of-type(even) {
display: none;
}
.modal-dialog-one{
width: 668px;
}
</style>
<!--导航star-->
......@@ -400,7 +409,7 @@
</div>
<!-- #批量修改客方-->
<div class="modal fade" id="modal_modify_user" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-dialog modal-dialog-one">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">
......@@ -410,7 +419,7 @@
批量修改客方
</h4>
</div>
<div class="modal-body">
<div class="modal-body modal-body-one">
<br>
<!-- ============添加========== -->
<div class="jian_class">
......@@ -423,6 +432,7 @@
<input name="ues_id" placeholder="请输入经纪人姓名" type="tel" value="" class="phone_jia new_agents form-control">
<ul class="phone_list"></ul>
</div>
<br><br><br>
</div>
......
application/model/FollowUpLogModel.php
View file @ 7f251b85
......@@ -107,6 +107,7 @@ class FollowUpLogModel extends Model
->alias("a")
->join("a_agents b","a.agent_id = b.id","left")
->join("a_store c","b.store_id = c.id","left")
->join("o_report d","a.report_id = d.id","left")
->where($where_)
->select();
}
......
application/model/GHousesFollowUp.php 0 → 100644
View file @ 7f251b85
<?php
namespace app\model;
use think\Db;
use think\Model;
/**
* Created by PhpStorm.
* User : zw
* Date : 2018/4/23
* Time : 下午4:31
* Intro:
*/
class GHousesFollowUp extends Model
{
protected $table = "g_houses_follow_up";
protected $db_;
function __construct()
{
$this->db_ = Db::table($this->table);
}
/**
* @param $params
* @return int|string
*/
public function addHousesFollowUp($params)
{
$where_ = [];
if (isset($params["house_id"])) {
$where_["house_id"] = $params["house_id"];
}
if (isset($params["follow_up_info"])) {
$where_["follow_up_info"] = $params["follow_up_info"];
}
if (isset($params["agent_id"])) {
$where_["agent_id"] = $params["agent_id"];
}
if (isset($params["agent_name"])) {
$where_["agent_name"] = $params["agent_name"];
}
if (isset($params["agent_phone"])) {
$where_["agent_phone"] = $params["agent_phone"];
}
$where_["create_time"] = date("Y-m-d H:i:s", time());
$where_["update_time"] = date("Y-m-d H:i:s", time());
Db::startTrans();
try {
$id = $this->db_->insertGetId($where_);
Db::commit();
return $id;
} catch (\Exception $e) {
Db::rollback();
return 0;
}
}
/**
* @param $field
* @param $params
* @return false|\PDOStatement|string|\think\Collection
*/
public function getShopFollowUpList($field, $params)
{
$where_ = [];
$where_["a.house_id"] = $params["house_id"];
return $this->db_
->field($field)
->alias("a")
->join("a_agents b", "a.agent_id = b.id", "left")
->join("a_store c", "b.store_id = c.id", "left")
->where($where_)
->select();
}
}
\ No newline at end of file
application/route.php
View file @ 7f251b85
......@@ -356,6 +356,7 @@ Route::group('broker', [
//商铺
'getShopList' => ['api_broker/Shop/getShopList', [ 'method' => 'get|post' ] ],
'getShopDetail' => ['api_broker/Shop/getShopDetail', [ 'method' => 'get' ] ],
'addShopFollowUp' => ['api_broker/Shop/addShopFollowUp', [ 'method' => 'post' ] ], //新增商铺跟进记录
'reportList' => ['api_broker/Report/reportList', [ 'method' => 'get' ] ],
......
public/app/js/customer_gj.js
View file @ 7f251b85
require(['vue', 'vconsole', 'css!style/customerinfo_sub_page.css', 'css!style/customer_gj.css', 'jquery0325', 'common'], function(Vue,VConsole) {
require(['vue', 'vconsole', 'css!style/customerinfo_sub_page.css', 'css!style/customer_gj.css', 'jquery0325', 'common'], function(Vue, VConsole) {
var vConsole = new VConsole();
var _applyId = getUrlParam("applyid"); //获取GET参数
var _token = getUrlParam("token");
......
public/app/js/daily_achieve_dz.js
View file @ 7f251b85
'use strict';
require(['vue', 'html2canvas', 'css!style/report_achieve.css', 'jquery0325', 'common'], function(Vue, html2canvas) {
require(['vue', 'vconsole', 'html2canvas', 'css!style/report_achieve.css', 'jquery0325', 'common'], function(Vue, VConsole, html2canvas) {
var vConsole = new VConsole();
$('title').after('<meta name="viewport" content="width=device-width,initial-scale=' + (window.screen.width / 750) + ',maximum-scale=2.0,user-scalable=0" />');
var _appToken = getUrlParam('token');
var vm = new Vue({
......@@ -20,6 +21,7 @@ require(['vue', 'html2canvas', 'css!style/report_achieve.css', 'jquery0325', 'co
'titlename': '成交单数'
}],
peopleNum: 1,
peopleList: [],
nowDayNum: parseInt(new Date().getDate()),
canClickFlag: true
},
......@@ -96,6 +98,7 @@ require(['vue', 'html2canvas', 'css!style/report_achieve.css', 'jquery0325', 'co
_this.fangyuan = _data.data.house_num;
_this.daikan = _data.data.follow_up_num;
_this.peopleNum = Number(_data.data.agent_total);
_this.peopleList = _data.data.store_list;
} else {
layerTipsX(_data['msg']);
}
......
public/app/js/daily_achieve_mdzj.js
View file @ 7f251b85
'use strict';
require(['vue', 'html2canvas', 'css!style/report_achieve.css', 'jquery0325', 'common'], function(Vue, html2canvas) {
require(['vue', 'vconsole', 'html2canvas', 'css!style/report_achieve.css', 'jquery0325', 'common'], function(Vue, VConsole, html2canvas) {
var vConsole = new VConsole();
$('title').after('<meta name="viewport" content="width=device-width,initial-scale=' + (window.screen.width / 750) + ',maximum-scale=2.0,user-scalable=0" />');
var _appToken = getUrlParam('token');
var vm = new Vue({
......
public/app/js/weekly.js
View file @ 7f251b85
'use strict';
require(['vue', 'css!style/weekly.css', 'jquery0325', 'common'], function(Vue) {
require(['vue', 'vconsole', 'css!style/weekly.css', 'jquery0325', 'common'], function(Vue, VConsole) {
var vConsole = new VConsole();
var _appToken = getUrlParam('token');
var vm = new Vue({
el: '#app',
......
public/resource/js/user.js
View file @ 7f251b85
......@@ -134,6 +134,8 @@ define (['doT', 'text!temp/user_template_tpl.html','ckfinder','ckfinderStart', '
'3': item['id']
});
});
// 输出trim
_this.next().show().html(_htmlTemp);
}else{
_this.next().html('');
......
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