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
12e9ff38
Commit
12e9ff38
authored
Mar 28, 2019
by
zhuwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
收款总计
parent
3a76dc9a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
1 deletion
+15
-1
Finance.php
application/index/controller/Finance.php
+14
-1
OPayLogModel.php
application/model/OPayLogModel.php
+1
-0
No files found.
application/index/controller/Finance.php
View file @
12e9ff38
...
...
@@ -3021,11 +3021,24 @@ class Finance extends Basic
$data
[
'list'
]
=
$list
;
//加时间条件
if
(
$is_show
)
{
$data
[
'money_total'
]
=
$order
->
getMoneyTotal
(
$where
,
'a.real_money'
);
//总额
$where
[
'a.source'
]
=
array
(
'neq'
,
2
);
$data
[
'money_total'
]
=
$order
->
getMoneyTotal
(
$where
,
'a.money'
);
//收款总计(正常)
$where
[
'a.source'
]
=
2
;
$data
[
'money_change_total'
]
=
$order
->
getMoneyTotal
(
$where
,
'a.money'
);
//收款总计(调整)
$where
[
'a.source'
]
=
array
(
'neq'
,
2
);
$data
[
'real_money_total'
]
=
$order
->
getMoneyTotal
(
$where
,
'a.real_money'
);
//实付总计(正常)
$where
[
'a.source'
]
=
2
;
$data
[
'real_money_change_total'
]
=
$order
->
getMoneyTotal
(
$where
,
'a.real_money'
);
//实付总计(调整)
}
else
{
$data
[
'money_total'
]
=
''
;
$data
[
'money_change_total'
]
=
''
;
$data
[
'real_money_total'
]
=
''
;
$data
[
'real_money_change_total'
]
=
''
;
}
$data
[
'list'
]
=
$this
->
numberTransitionString
(
$data
[
'list'
]);
}
catch
(
\Exception
$e
)
{
$msg
=
'内部错误:'
.
$e
->
getMessage
();
if
(
$this
->
params
[
'excel'
]
==
1
)
{
...
...
application/model/OPayLogModel.php
View file @
12e9ff38
...
...
@@ -396,6 +396,7 @@ class OPayLogModel extends Model
->
sum
(
$field
);
}
big_log
(
$this
->
getLastSql
());
return
$data
;
}
...
...
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