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
f436171a
Commit
f436171a
authored
Jun 25, 2019
by
姜登
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
id
parent
459d00cf
Pipeline
#9449
passed with stage
in 9 seconds
Changes
3
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
price.js
app/controller/price.js
+1
-1
recharge.js
app/controller/recharge.js
+1
-1
remission.js
app/controller/remission.js
+1
-1
No files found.
app/controller/price.js
View file @
f436171a
...
...
@@ -42,7 +42,7 @@ class PriceController extends Controller {
const
{
ctx
,
service
}
=
this
;
ctx
.
validate
(
this
.
indexRule
,
ctx
.
query
);
await
service
.
user
.
getUserInfo
();
const
ret
=
await
service
.
userDetail
.
findAll
(
this
.
model
,
{
appkey
:
ctx
.
query
.
appKey
},
[
'pay_type'
,
'price'
,
'start_time'
,
'end_time'
,
'operator'
],
ctx
.
pagination
);
const
ret
=
await
service
.
userDetail
.
findAll
(
this
.
model
,
{
appkey
:
ctx
.
query
.
appKey
},
[
'
id'
,
'
pay_type'
,
'price'
,
'start_time'
,
'end_time'
,
'operator'
],
ctx
.
pagination
);
const
total
=
await
service
.
userDetail
.
count
(
this
.
model
,
{
appkey
:
ctx
.
query
.
appKey
});
ctx
.
success
({
data
:
ret
,
total
,
...
ctx
.
pagination
});
}
...
...
app/controller/recharge.js
View file @
f436171a
...
...
@@ -36,7 +36,7 @@ class RechargeController extends Controller {
const
{
ctx
,
service
}
=
this
;
ctx
.
validate
(
this
.
indexRule
,
ctx
.
query
);
await
service
.
user
.
getUserInfo
();
const
ret
=
await
service
.
userDetail
.
findAll
(
this
.
model
,
{
user_id
:
ctx
.
query
.
user_id
},
[
'user_id'
,
'money'
,
'receive_time'
,
'remark'
,
'operator'
],
ctx
.
pagination
);
const
ret
=
await
service
.
userDetail
.
findAll
(
this
.
model
,
{
user_id
:
ctx
.
query
.
user_id
},
[
'
id'
,
'
user_id'
,
'money'
,
'receive_time'
,
'remark'
,
'operator'
],
ctx
.
pagination
);
const
total
=
await
service
.
userDetail
.
count
(
this
.
model
,
{
user_id
:
ctx
.
query
.
user_id
});
ctx
.
success
({
data
:
ret
,
total
,
...
ctx
.
pagination
});
}
...
...
app/controller/remission.js
View file @
f436171a
...
...
@@ -33,7 +33,7 @@ class RemissionController extends Controller {
const
{
ctx
,
service
}
=
this
;
ctx
.
validate
(
this
.
indexRule
,
ctx
.
query
);
await
service
.
user
.
getUserInfo
();
const
ret
=
await
service
.
userDetail
.
findAll
(
this
.
model
,
{
appkey
:
ctx
.
query
.
appKey
},
[
'appkey'
,
'start_time'
,
'count'
,
'operator'
],
ctx
.
pagination
);
const
ret
=
await
service
.
userDetail
.
findAll
(
this
.
model
,
{
appkey
:
ctx
.
query
.
appKey
},
[
'
id'
,
'
appkey'
,
'start_time'
,
'count'
,
'operator'
],
ctx
.
pagination
);
const
total
=
await
service
.
userDetail
.
count
(
this
.
model
,
{
appkey
:
ctx
.
query
.
appKey
});
ctx
.
success
({
data
:
ret
,
total
,
...
ctx
.
pagination
});
}
...
...
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