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
b306294c
Commit
b306294c
authored
Jan 07, 2019
by
hujun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
where
parent
e60a3fd3
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
1 deletion
+4
-1
Finance.php
application/index/controller/Finance.php
+4
-1
No files found.
application/index/controller/Finance.php
View file @
b306294c
...
@@ -1574,7 +1574,7 @@ class Finance extends Basic
...
@@ -1574,7 +1574,7 @@ class Finance extends Basic
/**经纪人手机号**/
/**经纪人手机号**/
if
(
!
empty
(
$this
->
params
[
'agent_id'
]))
{
if
(
!
empty
(
$this
->
params
[
'agent_id'
]))
{
$taxes_where
[
'
c.agent_id'
]
=
$taxes_
where
[
'a.agent_id'
]
=
$this
->
params
[
'agent_id'
];
$taxes_where
[
'
b.agent_id'
]
=
$
where
[
'a.agent_id'
]
=
$this
->
params
[
'agent_id'
];
}
}
$fields
=
'sum( a.practical_fee ) as practical_fee,sum( a.real_fee ) as real_fee,'
;
$fields
=
'sum( a.practical_fee ) as practical_fee,sum( a.real_fee ) as real_fee,'
;
...
@@ -1589,6 +1589,7 @@ class Finance extends Basic
...
@@ -1589,6 +1589,7 @@ class Finance extends Basic
$taxes_where
[
'a.is_del'
]
=
0
;
$taxes_where
[
'a.is_del'
]
=
0
;
// $taxes_where['b.status'] = ['IN', '10,11,13'];
// $taxes_where['b.status'] = ['IN', '10,11,13'];
$taxes_where
[
'a.operation_date'
]
=
[
'between'
,
[
$operation_start_data
,
$operation_end_data
]];
$taxes_where
[
'a.operation_date'
]
=
[
'between'
,
[
$operation_start_data
,
$operation_end_data
]];
$data
[
'data'
][
'total_taxes'
]
=
$m_tax
->
sumBargainFee
(
'a.fee'
,
$taxes_where
);;
$data
[
'data'
][
'total_taxes'
]
=
$m_tax
->
sumBargainFee
(
'a.fee'
,
$taxes_where
);;
if
(
!
empty
(
$this
->
params
[
'confirm_date'
]))
{
if
(
!
empty
(
$this
->
params
[
'confirm_date'
]))
{
...
@@ -1602,6 +1603,8 @@ class Finance extends Basic
...
@@ -1602,6 +1603,8 @@ class Finance extends Basic
$list
[
$k
][
'operation_date'
]
=
$operation_date
;
$list
[
$k
][
'operation_date'
]
=
$operation_date
;
$list
[
$k
][
'district_store'
]
=
$m_store
->
getStoreDistrictName
(
$v
[
'store_id'
]);
$list
[
$k
][
'district_store'
]
=
$m_store
->
getStoreDistrictName
(
$v
[
'store_id'
]);
$list
[
$k
][
'fee'
]
=
empty
(
$v
[
'fee'
])
?
0
:
$v
[
'fee'
];
$list
[
$k
][
'fee'
]
=
empty
(
$v
[
'fee'
])
?
0
:
$v
[
'fee'
];
$list
[
$k
][
'service_charge'
]
=
empty
(
$v
[
'service_charge'
])
?
0
:
$v
[
'service_charge'
];
$list
[
$k
][
'charity_fund'
]
=
empty
(
$v
[
'charity_fund'
])
?
0
:
$v
[
'charity_fund'
];
}
}
$data
[
'data'
][
'list'
]
=
$list
;
$data
[
'data'
][
'list'
]
=
$list
;
...
...
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