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
2e2d057c
Commit
2e2d057c
authored
Apr 27, 2020
by
姜登
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
product
parent
dd71c750
Pipeline
#22322
passed with stage
in 2 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
user.js
app/service/user.js
+3
-3
userDetail.js
app/service/userDetail.js
+2
-0
No files found.
app/service/user.js
View file @
2e2d057c
...
...
@@ -116,9 +116,9 @@ class UserService extends Service {
],
where
:
{
user_id
,
day
:
last_day
},
})
ctx
.
logger
.
info
(
'lastday_data'
,
lastday_data
)
lastday_info
.
use_amount
=
lastday_data
&&
lastday_data
.
amount
?
Number
(
parseFloat
(
lastday_data
.
amount
).
toFixed
(
2
))
:
0
;
lastday_info
.
use_money
=
lastday_data
&&
lastday_data
.
cost
?
Number
(
parseFloat
(
lastday_data
.
cost
).
toFixed
(
2
))
:
0
;
ctx
.
logger
.
info
(
'lastday_data'
,
lastday_data
.
amount
,
lastday_data
.
cost
)
lastday_info
.
use_amount
=
lastday_data
&&
lastday_data
.
amount
>
0
?
Number
(
parseFloat
(
lastday_data
.
amount
).
toFixed
(
2
))
:
0
;
lastday_info
.
use_money
=
lastday_data
&&
lastday_data
.
cost
>
0
?
Number
(
parseFloat
(
lastday_data
.
cost
).
toFixed
(
2
))
:
0
;
const
left_money
=
await
ctx
.
dataModel
.
YzbillBalance
.
findOne
({
attributes
:
[
'balance_fn'
],
...
...
app/service/userDetail.js
View file @
2e2d057c
...
...
@@ -60,6 +60,7 @@ class UserDetailService extends Service {
ctx
.
logger
.
info
(
product
)
let
where
=
{
user_id
};
if
(
product
)
{
product
=
JSON
.
parse
(
product
);
if
(
product
.
length
>
0
)
{
ret
.
product
=
product
;
where
.
service
=
product
;
...
...
@@ -142,6 +143,7 @@ class UserDetailService extends Service {
let
where
=
{
user_id
};
if
(
product
)
{
product
=
JSON
.
parse
(
product
);
if
(
product
.
length
>
0
)
{
ret
.
product
=
product
;
where
.
service
=
product
;
...
...
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