Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
T
tl_estate
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
hujun
tl_estate
Commits
9de03dc6
Commit
9de03dc6
authored
Jul 05, 2019
by
clone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
d2332efa
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
14 additions
and
35 deletions
+14
-35
Broker.php
application/api_broker/controller/Broker.php
+1
-17
HomePageLog.php
application/api_broker/controller/HomePageLog.php
+2
-8
OfficeHomePageLog.php
application/api_broker/controller/OfficeHomePageLog.php
+2
-8
OfficeUPhoneFollowUp.php
application/model/OfficeUPhoneFollowUp.php
+3
-0
UPhoneFollowUpTemporary.php
application/model/UPhoneFollowUpTemporary.php
+3
-0
FollowUpTask.php
application/task/controller/FollowUpTask.php
+3
-2
No files found.
application/api_broker/controller/Broker.php
View file @
9de03dc6
...
@@ -26,20 +26,14 @@ use app\model\ACollectUser;
...
@@ -26,20 +26,14 @@ use app\model\ACollectUser;
use
app\model\ASite
;
use
app\model\ASite
;
use
app\model\AuthGroup
;
use
app\model\AuthGroup
;
use
app\model\AuthRule
;
use
app\model\AuthRule
;
use
app\model\ChatUserExt
;
use
app\model\Evaluate
;
use
app\model\Evaluate
;
use
app\model\GOperatingRecords
;
use
app\model\GOperatingRecords
;
use
app\model\NoteLog
;
use
app\model\NoteLog
;
use
app\model\OBargainModel
;
use
app\model\OBargainModel
;
use
app\model\OfficeFollowUpLogModel
;
use
app\model\OfficeUPhoneFollowUp
;
use
app\model\OfficeUPhoneFollowUp
;
use
app\model\OfficeUPhoneFollowUpImg
;
use
app\model\SecretReport
;
use
app\model\SecretReport
;
use
app\model\UPhoneFollowUp
;
use
app\model\UPhoneFollowUpImg
;
use
app\model\UPhoneFollowUpTemporary
;
use
app\model\UPhoneFollowUpTemporary
;
use
app\model\Users
;
use
app\model\Users
;
use
app\task\controller\FollowUpTask
;
use
think\Exception
;
use
think\Exception
;
use
think\Log
;
use
think\Log
;
use
think\Request
;
use
think\Request
;
...
@@ -484,7 +478,7 @@ class Broker extends Basic
...
@@ -484,7 +478,7 @@ class Broker extends Basic
'agent_id' => 1,
'agent_id' => 1,
'type' => 1,//0电话跟进 1普通跟进
'type' => 1,//0电话跟进 1普通跟进
'entrust_type' => 1,//委托类型 0找铺 1找办公楼
'entrust_type' => 1,//委托类型 0找铺 1找办公楼
'img_
arr' => []
'img_
str' => ""
);*/
);*/
...
@@ -495,25 +489,15 @@ class Broker extends Basic
...
@@ -495,25 +489,15 @@ class Broker extends Basic
if
(
$params
[
'agent_id'
]
!=
$this
->
agentId
)
{
if
(
$params
[
'agent_id'
]
!=
$this
->
agentId
)
{
return
$this
->
response
(
"101"
,
"身份验证失败!"
);
return
$this
->
response
(
"101"
,
"身份验证失败!"
);
}
}
$img_arr
=
isset
(
$params
[
"img_arr"
])
?
json_decode
(
$params
[
"img_arr"
],
true
)
:
""
;
unset
(
$params
[
"march_in_img"
]);
$entrust_type
=
$params
[
"entrust_type"
];
$entrust_type
=
$params
[
"entrust_type"
];
$result
=
[];
$result
=
[];
if
(
$entrust_type
==
0
)
{
if
(
$entrust_type
==
0
)
{
$s_phone_follow_up
=
new
UPhoneFollowUpTemporary
(
$this
->
siteId
);
$s_phone_follow_up
=
new
UPhoneFollowUpTemporary
(
$this
->
siteId
);
$result
=
$s_phone_follow_up
->
savePhoneFollow
(
$params
);
$result
=
$s_phone_follow_up
->
savePhoneFollow
(
$params
);
$oImgModel
=
new
UPhoneFollowUpImg
();
}
else
{
}
else
{
$office_follow_up
=
new
OfficeUPhoneFollowUp
(
$this
->
siteId
);
$office_follow_up
=
new
OfficeUPhoneFollowUp
(
$this
->
siteId
);
$result
=
$office_follow_up
->
savePhoneFollow
(
$params
);
$result
=
$office_follow_up
->
savePhoneFollow
(
$params
);
$oImgModel
=
new
OfficeUPhoneFollowUpImg
();
}
}
if
(
$img_arr
&&
$result
){
$oImgModel
->
addImgAll
(
$result
,
1
,
$img_arr
);
}
if
(
$result
>
0
)
{
if
(
$result
>
0
)
{
$redis_service
=
new
RedisCacheService
();
$redis_service
=
new
RedisCacheService
();
...
...
application/api_broker/controller/HomePageLog.php
View file @
9de03dc6
...
@@ -86,7 +86,7 @@ class HomePageLog extends Basic
...
@@ -86,7 +86,7 @@ class HomePageLog extends Basic
$pageNo
=
empty
(
$params
[
'pageNo'
])
?
1
:
$params
[
'pageNo'
];
$pageNo
=
empty
(
$params
[
'pageNo'
])
?
1
:
$params
[
'pageNo'
];
$pageSize
=
empty
(
$params
[
'pageSize'
])
?
15
:
$params
[
'pageSize'
];
$pageSize
=
empty
(
$params
[
'pageSize'
])
?
15
:
$params
[
'pageSize'
];
$field
=
"id,user_id,agent_id,type,content,create_time,user_status,labels_id"
;
$field
=
"id,user_id,agent_id,type,content,create_time,user_status,labels_id
,img_str
"
;
$where_
=
[];
$where_
=
[];
$where
=
' 1=1 '
;
$where
=
' 1=1 '
;
if
(
!
empty
(
$params
[
"search_content"
]))
{
if
(
!
empty
(
$params
[
"search_content"
]))
{
...
@@ -150,13 +150,7 @@ class HomePageLog extends Basic
...
@@ -150,13 +150,7 @@ class HomePageLog extends Basic
$result
[
$key
][
'img'
]
=
''
;
$result
[
$key
][
'img'
]
=
''
;
$result
[
$key
][
'store_name'
]
=
''
;
$result
[
$key
][
'store_name'
]
=
''
;
}
}
//查询跟进图片
$result
[
$key
][
'img_str_path'
]
=
CHAT_IMG_URL
;
$imgModel
=
new
UPhoneFollowUpImg
();
$img_param
[
"img_id"
]
=
$value
[
"id"
];
$img_param
[
"img_type"
]
=
1
;
$img_arr
=
$imgModel
->
getImgList
(
$img_param
,
"id,img_name"
);
$v
[
"img_path"
]
=
CHAT_IMG_URL
;
$result
[
$key
][
'follow_up_img_arr'
]
=
$img_arr
;
if
(
$if_search
)
if
(
$if_search
)
$result
[
$key
][
'create_time'
]
=
date
(
"Y-m-d H:i:s"
,
$value
[
"create_time"
]
/
1000
);
$result
[
$key
][
'create_time'
]
=
date
(
"Y-m-d H:i:s"
,
$value
[
"create_time"
]
/
1000
);
...
...
application/api_broker/controller/OfficeHomePageLog.php
View file @
9de03dc6
...
@@ -88,7 +88,7 @@ class OfficeHomePageLog extends Basic
...
@@ -88,7 +88,7 @@ class OfficeHomePageLog extends Basic
$pageNo
=
empty
(
$params
[
'pageNo'
])
?
1
:
$params
[
'pageNo'
];
$pageNo
=
empty
(
$params
[
'pageNo'
])
?
1
:
$params
[
'pageNo'
];
$pageSize
=
empty
(
$params
[
'pageSize'
])
?
15
:
$params
[
'pageSize'
];
$pageSize
=
empty
(
$params
[
'pageSize'
])
?
15
:
$params
[
'pageSize'
];
$field
=
"id,user_id,agent_id,type,content,create_time,user_status,labels_id"
;
$field
=
"id,user_id,agent_id,type,content,create_time,user_status,labels_id
,img_str
"
;
$where
=
' 1=1 '
;
$where
=
' 1=1 '
;
if
(
!
empty
(
$params
[
"search_content"
]))
{
if
(
!
empty
(
$params
[
"search_content"
]))
{
$search_content
=
trim
(
$params
[
'search_content'
]);
$search_content
=
trim
(
$params
[
'search_content'
]);
...
@@ -129,13 +129,7 @@ class OfficeHomePageLog extends Basic
...
@@ -129,13 +129,7 @@ class OfficeHomePageLog extends Basic
$result
[
$key
][
'img'
]
=
''
;
$result
[
$key
][
'img'
]
=
''
;
$result
[
$key
][
'store_name'
]
=
''
;
$result
[
$key
][
'store_name'
]
=
''
;
}
}
//查询跟进图片
$result
[
$key
][
'img_str_path'
]
=
CHAT_IMG_URL
;
$imgModel
=
new
OfficeUPhoneFollowUpImg
();
$img_param
[
"img_id"
]
=
$value
[
"id"
];
$img_param
[
"img_type"
]
=
1
;
$img_arr
=
$imgModel
->
getImgList
(
$img_param
,
"id,img_name"
);
$v
[
"img_path"
]
=
CHAT_IMG_URL
;
$result
[
$key
][
'follow_up_img_arr'
]
=
$img_arr
;
#保护期(0:保护器内 1:超过保护期)
#保护期(0:保护器内 1:超过保护期)
$result
[
$key
][
'is_outstrip_twenty_four_hours'
]
=
$user_service
->
isUserProtect
(
$value
[
'user_id'
]);
$result
[
$key
][
'is_outstrip_twenty_four_hours'
]
=
$user_service
->
isUserProtect
(
$value
[
'user_id'
]);
...
...
application/model/OfficeUPhoneFollowUp.php
View file @
9de03dc6
...
@@ -52,6 +52,9 @@ class OfficeUPhoneFollowUp extends BaseModel
...
@@ -52,6 +52,9 @@ class OfficeUPhoneFollowUp extends BaseModel
if
(
isset
(
$params
[
'create_time'
]))
{
if
(
isset
(
$params
[
'create_time'
]))
{
$arr
[
"create_time"
]
=
$params
[
"create_time"
];
$arr
[
"create_time"
]
=
$params
[
"create_time"
];
}
}
if
(
isset
(
$params
[
'img_str'
]))
{
$arr
[
"img_str"
]
=
$params
[
"img_str"
];
}
if
(
isset
(
$this
->
siteId
))
{
if
(
isset
(
$this
->
siteId
))
{
switch
(
$this
->
siteId
)
{
switch
(
$this
->
siteId
)
{
...
...
application/model/UPhoneFollowUpTemporary.php
View file @
9de03dc6
...
@@ -66,6 +66,9 @@ class UPhoneFollowUpTemporary extends BaseModel
...
@@ -66,6 +66,9 @@ class UPhoneFollowUpTemporary extends BaseModel
if
(
isset
(
$params
[
'create_time'
]))
{
if
(
isset
(
$params
[
'create_time'
]))
{
$arr
[
"create_time"
]
=
$params
[
"create_time"
];
$arr
[
"create_time"
]
=
$params
[
"create_time"
];
}
}
if
(
isset
(
$params
[
'img_str'
]))
{
$arr
[
"img_str"
]
=
$params
[
"img_str"
];
}
if
(
isset
(
$this
->
siteId
))
{
if
(
isset
(
$this
->
siteId
))
{
switch
(
$this
->
siteId
)
{
switch
(
$this
->
siteId
)
{
...
...
application/task/controller/FollowUpTask.php
View file @
9de03dc6
...
@@ -87,6 +87,7 @@ class FollowUpTask
...
@@ -87,6 +87,7 @@ class FollowUpTask
`labels_id` int(10) DEFAULT '0' COMMENT 'u_labels表主键',
`labels_id` int(10) DEFAULT '0' COMMENT 'u_labels表主键',
`user_id` int(10) unsigned DEFAULT '0' COMMENT 'u_users ID用户表id',
`user_id` int(10) unsigned DEFAULT '0' COMMENT 'u_users ID用户表id',
`agent_id` int(10) unsigned DEFAULT '0' COMMENT 'agent表id',
`agent_id` int(10) unsigned DEFAULT '0' COMMENT 'agent表id',
`img_str` varchar(60) DEFAULT '' COMMENT '图片',
`province` varchar(60) DEFAULT '' COMMENT '省份',
`province` varchar(60) DEFAULT '' COMMENT '省份',
`city` varchar(60) DEFAULT '' COMMENT '城市',
`city` varchar(60) DEFAULT '' COMMENT '城市',
`disc` varchar(60) DEFAULT '' COMMENT '区域',
`disc` varchar(60) DEFAULT '' COMMENT '区域',
...
@@ -145,8 +146,8 @@ class FollowUpTask
...
@@ -145,8 +146,8 @@ class FollowUpTask
$isTable
=
$phoneFollowUpModel
->
query
(
'SHOW TABLES LIKE "'
.
$table_name
.
'"'
);
$isTable
=
$phoneFollowUpModel
->
query
(
'SHOW TABLES LIKE "'
.
$table_name
.
'"'
);
if
(
$isTable
)
{
if
(
$isTable
)
{
$sql
=
"INSERT into u_phone_follow_up_"
.
$site_id
.
"
$sql
=
"INSERT into u_phone_follow_up_"
.
$site_id
.
"
(content,labels_id,user_id,agent_id,province,city,disc,type,create_time,update_time,user_status )
(content,labels_id,user_id,agent_id,province,city,disc,type,create_time,update_time,user_status
,img_str
)
select content,labels_id,user_id,agent_id,province,city,disc,type,create_time,update_time,user_status
select content,labels_id,user_id,agent_id,province,city,disc,type,create_time,update_time,user_status
,img_str
from `"
.
$table_name
.
"`"
;
from `"
.
$table_name
.
"`"
;
$followUpModel
=
new
UPhoneFollowUp
(
$site_id
);
$followUpModel
=
new
UPhoneFollowUp
(
$site_id
);
if
(
false
!==
$followUpModel
->
execute
(
$sql
))
{
if
(
false
!==
$followUpModel
->
execute
(
$sql
))
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment