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
b9f40450
Commit
b9f40450
authored
Dec 20, 2018
by
hujun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
实收金额汇总
parent
e33e067b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
3 deletions
+15
-3
Finance.php
application/index/controller/Finance.php
+4
-3
OPartialCommission.php
application/model/OPartialCommission.php
+11
-0
No files found.
application/index/controller/Finance.php
View file @
b9f40450
...
@@ -1684,6 +1684,7 @@ class Finance extends Basic
...
@@ -1684,6 +1684,7 @@ class Finance extends Basic
}
}
$data
[
'data'
][
'list'
]
=
$list
;
$data
[
'data'
][
'list'
]
=
$list
;
$data
[
'data'
][
'total'
]
=
$m_partial
->
getCommissionTotalListTotalV2
(
$where
);
$data
[
'data'
][
'total'
]
=
$m_partial
->
getCommissionTotalListTotalV2
(
$where
);
$data
[
'data'
][
'total_money'
]
=
$m_partial
->
getCommissionTotalField
(
'a.practical_fee'
,
$where
);
}
else
{
}
else
{
$data
[
'code'
]
=
101
;
$data
[
'code'
]
=
101
;
$data
[
'msg'
]
=
'内部错误'
.
$result_data
[
'msg'
];
$data
[
'msg'
]
=
'内部错误'
.
$result_data
[
'msg'
];
...
@@ -2833,9 +2834,9 @@ class Finance extends Basic
...
@@ -2833,9 +2834,9 @@ class Finance extends Basic
*/
*/
public
function
collectingBill
()
{
public
function
collectingBill
()
{
$params
=
$this
->
params
;
$params
=
$this
->
params
;
if
(
!
isset
(
$params
[
"agent_id"
])
||
!
isset
(
$params
[
"report_id"
])
||
if
(
empty
(
$params
[
"agent_id"
])
||
empty
(
$params
[
"report_id"
])
||
!
isset
(
$params
[
"order_id"
])
||
!
isset
(
$params
[
"order_no"
])
|
!
isset
(
$params
[
"collecting_bill"
])
||
empty
(
$params
[
"order_id"
])
||
empty
(
$params
[
"order_no"
])
|
empty
(
$params
[
"collecting_bill"
])
||
!
isset
(
$params
[
"house_number"
])
||
!
isset
(
$params
[
"industry_type"
])
)
{
empty
(
$params
[
"house_number"
])
||
empty
(
$params
[
"industry_type"
])
)
{
return
$this
->
response
(
"101"
,
"请求参数错误"
);
return
$this
->
response
(
"101"
,
"请求参数错误"
);
}
}
...
...
application/model/OPartialCommission.php
View file @
b9f40450
...
@@ -332,6 +332,17 @@ class OPartialCommission extends BaseModel
...
@@ -332,6 +332,17 @@ class OPartialCommission extends BaseModel
return
$result
;
return
$result
;
}
}
public
function
getCommissionTotalField
(
$filed
,
$params
)
{
return
$this
->
alias
(
'a'
)
->
join
(
'a_agents b'
,
'a.agent_id = b.id'
,
'left'
)
->
join
(
'o_bargain c'
,
'a.bargain_id = c.id'
,
'left'
)
->
join
(
'o_real_income d'
,
'a.real_income_id = d.id'
,
'left'
)
->
join
(
'o_taxes f'
,
'a.bargain_id = f.bargain_id'
,
'left'
)
->
where
(
$params
)
->
group
(
'b.id'
)
->
sum
(
$filed
);
}
/**
/**
* @param $params
* @param $params
* @return int|string
* @return int|string
...
...
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