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
ef53fe4e
Commit
ef53fe4e
authored
Apr 21, 2020
by
姜登
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
home
parent
f4a4226f
Pipeline
#21973
passed with stage
in 2 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
yzbillCost.js
app/model/data/yzbillCost.js
+1
-1
yzbillCostMonth.js
app/model/data/yzbillCostMonth.js
+1
-1
user.js
app/service/user.js
+1
-1
No files found.
app/model/data/yzbillCost.js
View file @
ef53fe4e
...
...
@@ -3,7 +3,7 @@ const moment = require('moment');
module
.
exports
=
app
=>
{
const
{
STRING
,
INTEGER
,
DATE
,
DECIMAL
}
=
app
.
Sequelize
;
const
billCost
=
app
.
dataModel
.
define
(
'billCost'
,
{
const
billCost
=
app
.
dataModel
.
define
(
'
yz
billCost'
,
{
appKey
:
{
type
:
INTEGER
,
primaryKey
:
true
},
service
:
STRING
,
day
:
STRING
,
...
...
app/model/data/yzbillCostMonth.js
View file @
ef53fe4e
...
...
@@ -3,7 +3,7 @@ const moment = require('moment');
module
.
exports
=
app
=>
{
const
{
STRING
,
INTEGER
,
DATE
,
DECIMAL
}
=
app
.
Sequelize
;
const
billCostMonth
=
app
.
dataModel
.
define
(
'billCostMonth'
,
{
const
billCostMonth
=
app
.
dataModel
.
define
(
'
yz
billCostMonth'
,
{
appKey
:
{
type
:
INTEGER
,
primaryKey
:
true
},
service
:
STRING
,
day_month
:
STRING
,
...
...
app/service/user.js
View file @
ef53fe4e
...
...
@@ -104,7 +104,7 @@ class UserService extends Service {
const
last_day
=
moment
(
new
Date
()).
subtract
(
1
,
'day'
).
format
(
'YYYY-MM-DD'
);
const
last_month
=
moment
(
new
Date
()).
subtract
(
1
,
'day'
).
format
(
'YYYYMM'
);
const
lastday_data
=
await
ctx
.
dataModel
.
y
zBillCost
.
findOne
({
const
lastday_data
=
await
ctx
.
dataModel
.
Y
zBillCost
.
findOne
({
attributes
:
[
[
ctx
.
model
.
fn
(
'SUM'
,
'pull_volumn'
),
'amount'
],
[
ctx
.
model
.
fn
(
'SUM'
,
'cost'
),
'cost'
],
...
...
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