Skip to content

T
tl_estate
Commit 589a9973 authored by clone's avatar clone
Browse files
Options

Merge branch '0911-v3.3.9' of https://gitee.com/zwyjjc/tl_estate into 0911-v3.3.9

parents d3c06078 366ca3b9
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 42 additions and 34 deletions
application/api/validate/BrokerValidate.php
View file @ 589a9973
......@@ -9,31 +9,31 @@ use think\Validate;
class BrokerValidate extends Validate {
protected $rule = [
'agent_id' => 'require|number|gt:0',
'agents_id' => 'require|number|gt:0',
'house_id' => 'require|number|gt:0',
'user_id' => 'require|number|gt:0',
'source' => 'require|number|gt:0',
];
protected $message = [
'agent_id.require' => 'agent_id为必填字段',
'agent_id.number' => 'agent_id只能为数字',
'agent_id.gt' => 'agent_id必须大于0',
'agents_id.require' => 'agents_id为必填字段',
'agents_id.number' => 'agents_id只能为数字',
'agents_id.gt' => 'agents_id必须大于0',
'house_id.require' => 'house_id为必填字段',
'house_id.number' => 'house_id只能为数字',
'house_id.gt' => 'house_id必须大于0',
'house_id.require' => 'house_id为必填字段',
'house_id.number' => 'house_id只能为数字',
'house_id.gt' => 'house_id必须大于0',
'user_id.require' => 'user_id异常',
'user_id.number' => 'user_id异常',
'user_id.gt' => 'user_id异常',
'user_id.require' => 'user_id异常',
'user_id.number' => 'user_id异常',
'user_id.gt' => 'user_id异常',
'source.require' => 'source为必填字段',
'source.number' => 'source只能为数字',
'source.gt' => 'source必须大于0',
'source.require' => 'source为必填字段',
'source.number' => 'source只能为数字',
'source.gt' => 'source必须大于0',
];
protected $scene = [
'appraiserV2' => ['agent_id','house_id','user_id','source'],
'appraiserV2' => ['agents_id','house_id','user_id','source'],
];
......
application/index/controller/Evaluation.php
View file @ 589a9973
......@@ -88,7 +88,9 @@ class Evaluation extends Basic
$data['list'] = $this->evaluateModel->findEvaluationList($pageNo, $pageSize, 'a.id desc', $fields_evaluate, $where);
$data['total'] = $this->evaluateModel->findEvaluationListCount($fields_evaluate, $where);
foreach ($data['list'] as $k => $v) {
$data['list'][$k]['evaluate_content'] = $v['evaluate_content'] ? $v['evaluate_content'] : '';
}
$data['average_score'] = 0 ;//进场平均分数
$data['average_score_evaluation'] = 0 ;//评价平均分数
return $this->response(200, 'success', $data);
......
application/index/service/UserLogService.php
View file @ 589a9973
......@@ -392,40 +392,39 @@ class UserLogService
$user_service = new UserService();
$vip_services = new VipService();
$s_user_agent = new UserAgentService();
//客户客方 所有城市
$is_user_agent_boss = $called = 1;
$user_agent_list_arr = [];
$user_agent_list = $s_user_agent->getUserAgentId($user_id);
if ($user_agent_list) {
$is_user_agent_boss = 1;
$called = 1;
$user_agent_list_arr = [];
foreach ($user_agent_list as $key => $value) {
$user_agent_list_arr[] = $value['agent_id'];
#查询当前经纪人是否是某个客方的总监 0:可查看 1：不可查看
$agent_boss_res = $user_service->isUserAgentDirector($value['agent_id'], $agent_id);
if ($agent_boss_res == 0)
$is_user_agent_boss = 0;
#是否有绑定关系 0有 1无
$called_res = $this->userDetailIsOutpaceCallNumPhone($value['phone'], $agent_id);
$called_res = $this->userDetailIsOutpaceCallNumPhone($result_user_phone, $agent_id);
if ($called_res == 0)
$called = 0;
}
}
#查询当前经纪人是否是某个客方的总监 0:可查看 1：不可查看
$is_user_agent_boss_v2 = $user_service->isUserAgentDirector($result_agent_id, $agent_id);
if ($is_user_agent_boss_v2 == 0)
$is_user_agent_boss = 0;
// dump($result_agent_id);
// dump($agent_id);
// $is_user_agent_boss_v2 = $user_service->isUserAgentDirector($result_agent_id, $agent_id);
// if ($is_user_agent_boss_v2 == 0)
// $is_user_agent_boss = 0;
#是否有绑定关系 0有 1无
$called_v2 = $this->userDetailIsOutpaceCallNumPhone($result_user_phone, $agent_id);
if ($called_v2 == 0)
$called = 0;
big_log("是否有绑定关系{$called_v2}");
#判断当天被拨打是否超过5次 (0:拨打不超过5次 1:超过5次)
$is_outpace_call_num = $this->userDetailIsOutpaceCallNum5($user_id);
#客户是否在保护期内（0：保护器内 1：超过保护期）
$is_outstrip_twenty_four_hours = $user_service->isUserProtect($user_id);
......@@ -434,16 +433,16 @@ class UserLogService
#经纪人客户是否有约带看 0:可查看 1:不可查看
$is_report = $user_service->isReport($agent_id, $user_id);
big_log("经纪人客户是否有约带看{$is_report}");
// dump('++++++++++++++++++++');
// dump((($is_outpace_call_num == 0) and ($is_outstrip_twenty_four_hours == 1) and ($is_vip != 1)) );
// dump(($is_user_agent_boss == 0));
// dump(in_array($agent_id, $user_agent_list_arr));
// dump(($result_agent_id == $agent_id));
// dump((($is_vip == 1) and ($examine_vip == 0)));
// dump( (($is_outpace_call_num == 0) and ($is_outstrip_twenty_four_hours == 0) and (($is_user_agent_boss == 0) or (in_array($agent_id, $user_agent_list_arr)) or ($called == 0))));
// dump((($is_outpace_call_num == 1) and (($is_user_agent_boss == 0) or (in_array($agent_id, $user_agent_list_arr)) or ($called == 0))));
// dump(($is_report == 0));
// // dump(($is_report == 0));
if (
(($is_outpace_call_num == 0) and ($is_outstrip_twenty_four_hours == 1) and ($is_vip != 1)) //过保护期
......@@ -452,13 +451,16 @@ class UserLogService
OR
in_array($agent_id, $user_agent_list_arr)//客方可以看
OR
($result_agent_id == $agent_id)//客方可以看
OR
(($is_vip == 1) and ($examine_vip == 0))
OR
(($is_outpace_call_num == 0) and ($is_outstrip_twenty_four_hours == 0) and (($is_user_agent_boss == 0) or (in_array($agent_id, $user_agent_list_arr)) or ($called == 0)))
OR
(($is_outpace_call_num == 1) and (($is_user_agent_boss == 0) or (in_array($agent_id, $user_agent_list_arr)) or ($called == 0)))
(
($is_outpace_call_num == 1)
and (
($is_user_agent_boss == 0) or (in_array($agent_id, $user_agent_list_arr)) or ($called == 0)
)
)
// OR
// ($is_report == 0)
) {
......
public/app/distPC/index.html
View file @ 589a9973
......@@ -25,4 +25,4 @@
if(!doc.addEventListener) return;
win.addEventListener(resizeEvt, recalc, false);
doc.addEventListener('DOMContentLoaded', recalc, false);
})(document, window);</script><link href=./static/css/app.4f93c5dd66d52298a92b5875fc8f6f9a.css rel=stylesheet></head><body><div id=app></div><script src=https://api.tonglianjituan.com/app/js/libs/vue.min.js></script><script src=https://api.tonglianjituan.com/app/js/libs/vue-router.min.js></script><script type=text/javascript src=./static/js/manifest.07e9e0a7e758e6faeabd.js></script><script type=text/javascript src=./static/js/vendor.65fbbd75e9ce5c47c10e.js></script><script type=text/javascript src=./static/js/app.ec07addf9fe86cedb78b.js></script></body></html>
\ No newline at end of file
})(document, window);</script><link href=./static/css/app.4f93c5dd66d52298a92b5875fc8f6f9a.css rel=stylesheet></head><body><div id=app></div><script src=https://api.tonglianjituan.com/app/js/libs/vue.min.js></script><script src=https://api.tonglianjituan.com/app/js/libs/vue-router.min.js></script><script type=text/javascript src=./static/js/manifest.fdb1d78145f3ce8eaad4.js></script><script type=text/javascript src=./static/js/vendor.65fbbd75e9ce5c47c10e.js></script><script type=text/javascript src=./static/js/app.4491418932be7d9adeea.js></script></body></html>
\ No newline at end of file
public/app/distPC/static/js/1.f24abe7bfcbc2a81910a.js 0 → 100644
View file @ 589a9973
This diff is collapsed.
public/app/distPC/static/js/1.f6103e999f5c4dd67c15.js 0 → 100644
View file @ 589a9973
This diff is collapsed.
public/app/distPC/static/js/app.4491418932be7d9adeea.js 0 → 100644
View file @ 589a9973
This diff is collapsed.
public/app/distPC/static/js/manifest.db6570d1a258427c2c2a.js 0 → 100644
View file @ 589a9973
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,c,a){for(var i,u,f,s=0,l=[];s<r.length;s++)u=r[s],t[u]&&l.push(t[u][0]),t[u]=0;for(i in c)Object.prototype.hasOwnProperty.call(c,i)&&(e[i]=c[i]);for(n&&n(r,c,a);l.length;)l.shift()();if(a)for(s=0;s<a.length;s++)f=o(o.s=a[s]);return f};var r={},t={5:0};function o(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,o){n=t[e]=[r,o]});n[2]=r;var c=document.getElementsByTagName("head")[0],a=document.createElement("script");a.type="text/javascript",a.charset="utf-8",a.async=!0,a.timeout=12e4,o.nc&&a.setAttribute("nonce",o.nc),a.src=o.p+"static/js/"+e+"."+{0:"bbcac3785cae54b1bd6c",1:"f24abe7bfcbc2a81910a",2:"5dfb0095a8ee89244c50"}[e]+".js";var i=setTimeout(u,12e4);function u(){a.onerror=a.onload=null,clearTimeout(i);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return a.onerror=a.onload=u,c.appendChild(a),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="./",o.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
public/app/distPC/static/js/manifest.fdb1d78145f3ce8eaad4.js 0 → 100644
View file @ 589a9973
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,c,a){for(var i,u,f,s=0,l=[];s<r.length;s++)u=r[s],t[u]&&l.push(t[u][0]),t[u]=0;for(i in c)Object.prototype.hasOwnProperty.call(c,i)&&(e[i]=c[i]);for(n&&n(r,c,a);l.length;)l.shift()();if(a)for(s=0;s<a.length;s++)f=o(o.s=a[s]);return f};var r={},t={5:0};function o(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,o){n=t[e]=[r,o]});n[2]=r;var c=document.getElementsByTagName("head")[0],a=document.createElement("script");a.type="text/javascript",a.charset="utf-8",a.async=!0,a.timeout=12e4,o.nc&&a.setAttribute("nonce",o.nc),a.src=o.p+"static/js/"+e+"."+{0:"bbcac3785cae54b1bd6c",1:"f6103e999f5c4dd67c15",2:"5dfb0095a8ee89244c50"}[e]+".js";var i=setTimeout(u,12e4);function u(){a.onerror=a.onload=null,clearTimeout(i);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return a.onerror=a.onload=u,c.appendChild(a),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="./",o.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
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