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
ca0fa546
Commit
ca0fa546
authored
Oct 30, 2018
by
hujun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化
parent
cf7fdffd
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
Finance.php
application/index/controller/Finance.php
+2
-0
OBargainModel.php
application/model/OBargainModel.php
+1
-2
No files found.
application/index/controller/Finance.php
View file @
ca0fa546
...
@@ -261,6 +261,8 @@ class Finance extends Basic
...
@@ -261,6 +261,8 @@ class Finance extends Basic
if
(
$is_show
)
{
if
(
$is_show
)
{
$data
[
'data'
][
'total_commission'
]
=
$this
->
m_bargain
->
getBargainListSum
(
'commission'
,
$where
);
$data
[
'data'
][
'total_commission'
]
=
$this
->
m_bargain
->
getBargainListSum
(
'commission'
,
$where
);
$where
[
'b.create_time'
]
=
$where
[
'a.create_time'
];
unset
(
$where
[
'a.create_time'
]);
$data
[
'data'
][
'total_income_money'
]
=
$m_real
->
getIncomeListSum
(
'money'
,
$where
);
$data
[
'data'
][
'total_income_money'
]
=
$m_real
->
getIncomeListSum
(
'money'
,
$where
);
}
else
{
}
else
{
$data
[
'data'
][
'total_commission'
]
=
0
;
$data
[
'data'
][
'total_commission'
]
=
0
;
...
...
application/model/OBargainModel.php
View file @
ca0fa546
...
@@ -363,7 +363,6 @@ class OBargainModel extends Model
...
@@ -363,7 +363,6 @@ class OBargainModel extends Model
->
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'
)
->
join
(
'o_partial_commission e'
,
'e.bargain_id = a.id'
,
'left'
)
->
where
(
$params
)
->
where
(
$params
)
->
group
(
'a.id'
)
->
order
(
$order_
)
->
order
(
$order_
)
->
limit
(
$pageSize
)
->
limit
(
$pageSize
)
->
page
(
$pageNo
)
->
page
(
$pageNo
)
...
@@ -381,8 +380,8 @@ class OBargainModel extends Model
...
@@ -381,8 +380,8 @@ 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
)
->
group
(
'a.id'
)
->
sum
(
$field
);
->
sum
(
$field
);
}
}
...
...
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