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
540c3e61
Commit
540c3e61
authored
Oct 17, 2018
by
zhuwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
成交报告-详情(成交信息)加分佣ID
parent
73399ef3
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
Finance.php
application/index/controller/Finance.php
+4
-3
OBargainModel.php
application/model/OBargainModel.php
+1
-0
No files found.
application/index/controller/Finance.php
View file @
540c3e61
...
@@ -286,9 +286,10 @@ class Finance extends Basic
...
@@ -286,9 +286,10 @@ class Finance extends Basic
$data
[
'msg'
]
=
'Id is null.'
;
$data
[
'msg'
]
=
'Id is null.'
;
}
else
{
}
else
{
$bargain
=
new
OBargainModel
();
$bargain
=
new
OBargainModel
();
$fields
=
'a.id,a.create_time,b.user_phone,b.user_name,d.internal_title,d.internal_address,a.is_open,a.order_id,'
;
$fields
=
'a.id,a.create_time,b.user_phone,b.user_name,d.internal_title,d.internal_address,a.is_open,a.order_id,'
;
$fields
.=
'a.trade_type,a.house_number,a.commission,a.content,d.shop_type,a.industry_type,a.price,a.estimated_receipt_date,'
;
$fields
.=
'a.trade_type,a.house_number,a.commission,a.content,d.shop_type,a.industry_type,a.price,a.estimated_receipt_date,'
;
$fields
.=
'b.user_id,d.id as house_id'
;
$fields
.=
'e.id as partial_commission_id,'
;
$fields
.=
'b.user_id,d.id as house_id'
;
$where
[
'a.id'
]
=
$this
->
params
[
'id'
];
$where
[
'a.id'
]
=
$this
->
params
[
'id'
];
$data
[
'data'
]
=
$bargain
->
getBargainInfo
(
$fields
,
$where
);
$data
[
'data'
]
=
$bargain
->
getBargainInfo
(
$fields
,
$where
);
}
}
...
...
application/model/OBargainModel.php
View file @
540c3e61
...
@@ -488,6 +488,7 @@ class OBargainModel extends Model
...
@@ -488,6 +488,7 @@ class OBargainModel extends Model
->
join
(
'o_report b'
,
'a.report_id = b.id'
,
'left'
)
->
join
(
'o_report b'
,
'a.report_id = b.id'
,
'left'
)
->
join
(
'o_order c'
,
'a.order_id = c.id'
,
'left'
)
->
join
(
'o_order c'
,
'a.order_id = c.id'
,
'left'
)
->
join
(
'g_houses d'
,
'c.house_id = d.id'
,
'left'
)
->
join
(
'g_houses d'
,
'c.house_id = d.id'
,
'left'
)
->
join
(
'o_partial_commission e'
,
'e.bargain_id = a.id'
,
'left'
)
->
where
(
$params
)
->
where
(
$params
)
->
find
();
->
find
();
...
...
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