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
c80caaaf
Commit
c80caaaf
authored
Jul 09, 2019
by
hujun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
site_id
parent
8e377ccb
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
OrderLogService.php
application/api_broker/service/OrderLogService.php
+2
-1
Finance.php
application/index/controller/Finance.php
+1
-1
No files found.
application/api_broker/service/OrderLogService.php
View file @
c80caaaf
...
...
@@ -1640,7 +1640,7 @@ class OrderLogService
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
*/
public
function
searchBargainAllAgents
(
$order_id
)
public
function
searchBargainAllAgents
(
$order_id
,
$site_id
)
{
$orderModel
=
new
OrderModel
();
$field
=
"a.id,a.order_no,a.house_id,a.house_title,b.id as report_id,b.user_id,c.user_nick,c.user_phone,
...
...
@@ -1681,6 +1681,7 @@ class OrderLogService
}
$userModel
=
new
Users
();
$where_user
[
'c.site_id'
]
=
$site_id
;
$where_user
[
"a.id"
]
=
$result
[
0
][
"user_id"
];
$where_user
[
"b.status"
]
=
0
;
$user_data
=
$userModel
->
getAgentUser
(
$field
,
$where_user
);
...
...
application/index/controller/Finance.php
View file @
c80caaaf
...
...
@@ -1812,7 +1812,7 @@ class Finance extends Basic
try
{
$order_service
=
new
OrderLogService
();
$list
=
$order_service
->
searchBargainAllAgents
(
$params
[
"order_id"
]);
$list
=
$order_service
->
searchBargainAllAgents
(
$params
[
"order_id"
]
,
$this
->
siteId
);
if
(
count
(
$list
)
>
0
)
{
return
$this
->
response
(
"200"
,
"request success"
,
$list
);
}
else
{
...
...
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