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
c693fb99
Commit
c693fb99
authored
Mar 20, 2019
by
zhuwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
、、
parent
b7446e85
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
Finance.php
application/index/controller/Finance.php
+3
-2
No files found.
application/index/controller/Finance.php
View file @
c693fb99
...
...
@@ -986,6 +986,7 @@ class Finance extends Basic
}
}
$fields
=
'a.create_time,a.id,a.order_id,a.pay_log_id,a.refund_money,a.type,a.agent_id,a.agent_name,b.house_id,a.status,'
;
$fields
.=
'd.income_time,a.type,c.store_id'
;
$list
=
$refund
->
getCheckRefundList
(
$pageNo
,
$pageSize
,
'a.id DESC'
,
$fields
,
$where
);
...
...
@@ -1110,7 +1111,7 @@ class Finance extends Basic
$where
[
'a.pay_log_id'
]
=
$this
->
params
[
'pay_log_id'
];
}
if
(
is
set
(
$this
->
params
[
'is_self'
])
&&
$this
->
params
[
'is_self'
]
!=
-
1
)
{
if
(
is
_numeric
(
$this
->
params
[
'is_self'
])
&&
$this
->
params
[
'is_self'
]
!=
-
1
)
{
if
(
$this
->
params
[
'is_self'
])
{
$where
[
'e.operation_id'
]
=
$this
->
userId
;
}
else
{
...
...
@@ -1184,7 +1185,7 @@ class Finance extends Basic
$total_money
=
$refund
->
getSumMoney
(
$where
);
if
(
!
$
list
){
if
(
!
$
excel_data
){
return
'<script>alert("导出失败");window.close();</script>'
;
}
$export
=
new
ExportExcelUntil
();
...
...
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