Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
yizhi_server
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
data_server
yizhi_server
Commits
61d65f92
Commit
61d65f92
authored
Apr 22, 2020
by
姜登
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ret
parent
096073e6
Pipeline
#22016
passed with stage
in 2 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
10 deletions
+10
-10
userDetail.js
app/service/userDetail.js
+10
-10
No files found.
app/service/userDetail.js
View file @
61d65f92
...
...
@@ -85,24 +85,24 @@ class UserDetailService extends Service {
},
};
const
ret
=
await
ctx
.
dataModel
[
type
].
findAll
({
const
detail
=
await
ctx
.
dataModel
[
type
].
findAll
({
attributes
:
[
'day'
,
'pull_volume'
,
'cost'
],
where
,
order
:
[[
'day'
,
'desc'
]]
})
const
listMap
=
new
Map
();
for
(
let
i
=
0
;
i
<
ret
.
length
;
i
++
)
{
if
(
listMap
.
has
(
ret
[
i
].
day
))
{
let
obj
=
listMap
.
get
(
ret
[
i
].
day
);
obj
.
money
+=
parseFloat
(
ret
[
i
].
cost
);
obj
.
amount
+=
ret
[
i
].
pull_volume
;
listMap
.
set
(
ret
[
i
].
day
,
obj
);
for
(
let
i
=
0
;
i
<
detail
.
length
;
i
++
)
{
if
(
listMap
.
has
(
detail
[
i
].
day
))
{
let
obj
=
listMap
.
get
(
detail
[
i
].
day
);
obj
.
money
+=
parseFloat
(
detail
[
i
].
cost
);
obj
.
amount
+=
detail
[
i
].
pull_volume
;
listMap
.
set
(
detail
[
i
].
day
,
obj
);
}
else
{
listMap
.
set
(
ret
[
i
].
day
,
{
money
:
parseFloat
(
ret
[
i
].
cost
),
amount
:
ret
[
i
].
pull_volume
});
listMap
.
set
(
detail
[
i
].
day
,
{
money
:
parseFloat
(
detail
[
i
].
cost
),
amount
:
detail
[
i
].
pull_volume
});
}
ret
.
overview
.
use_money
+=
parseFloat
(
ret
[
i
].
cost
);
ret
.
overview
.
use_amount
+=
ret
[
i
].
pull_volume
;
ret
.
overview
.
use_money
+=
parseFloat
(
detail
[
i
].
cost
);
ret
.
overview
.
use_amount
+=
detail
[
i
].
pull_volume
;
if
(
listMap
.
size
>
0
)
{
listMap
.
forEach
((
value
,
key
)
=>
{
...
...
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