Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gogirl-miniapp-backend
Overview
Overview
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
huluobin
gogirl-miniapp-backend
Commits
8747a230
Commit
8747a230
authored
Aug 18, 2020
by
huluobin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
4.0报表
parent
43a0cdaf
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
AdminFeign.java
...main/java/com/gogirl/infrastructure/feign/AdminFeign.java
+2
-2
DashboardController.java
.../com/gogirl/interfaces/dashboard/DashboardController.java
+1
-1
AdminFeignTest.java
.../java/com/gogirl/infrastructure/feign/AdminFeignTest.java
+1
-1
No files found.
src/main/java/com/gogirl/infrastructure/feign/AdminFeign.java
View file @
8747a230
...
@@ -52,7 +52,7 @@ public interface AdminFeign {
...
@@ -52,7 +52,7 @@ public interface AdminFeign {
@PostMapping
(
value
=
"/api/Report/RevenueSumApi"
,
@PostMapping
(
value
=
"/api/Report/RevenueSumApi"
,
consumes
=
MediaType
.
APPLICATION_JSON_UTF8_VALUE
,
consumes
=
MediaType
.
APPLICATION_JSON_UTF8_VALUE
,
produces
=
MediaType
.
APPLICATION_JSON_UTF8_VALUE
)
produces
=
MediaType
.
APPLICATION_JSON_UTF8_VALUE
)
AdminResult
<
Map
<
String
,
Object
>>
revenueSumApi
(
@RequestBody
RevenueSumApiRequest
request
);
AdminResult
<
List
<
Map
<
String
,
Object
>
>>
revenueSumApi
(
@RequestBody
RevenueSumApiRequest
request
);
@Component
@Component
...
@@ -85,7 +85,7 @@ public interface AdminFeign {
...
@@ -85,7 +85,7 @@ public interface AdminFeign {
}
}
@Override
@Override
public
AdminResult
<
Map
<
String
,
Object
>>
revenueSumApi
(
RevenueSumApiRequest
request
)
{
public
AdminResult
<
List
<
Map
<
String
,
Object
>
>>
revenueSumApi
(
RevenueSumApiRequest
request
)
{
return
new
AdminResult
<>();
return
new
AdminResult
<>();
}
}
}
}
...
...
src/main/java/com/gogirl/interfaces/dashboard/DashboardController.java
View file @
8747a230
...
@@ -52,7 +52,7 @@ public class DashboardController {
...
@@ -52,7 +52,7 @@ public class DashboardController {
}
}
@PostMapping
(
"/revenueSumApi"
)
@PostMapping
(
"/revenueSumApi"
)
public
JsonResult
<
Map
<
String
,
Object
>>
revenueSumApi
(
RevenueSumApiRequest
request
)
{
public
JsonResult
<
List
<
Map
<
String
,
Object
>
>>
revenueSumApi
(
RevenueSumApiRequest
request
)
{
return
JsonResult
.
success
(
adminFeign
.
revenueSumApi
(
request
).
getData
());
return
JsonResult
.
success
(
adminFeign
.
revenueSumApi
(
request
).
getData
());
}
}
}
}
src/test/java/com/gogirl/infrastructure/feign/AdminFeignTest.java
View file @
8747a230
...
@@ -111,7 +111,7 @@ public class AdminFeignTest {
...
@@ -111,7 +111,7 @@ public class AdminFeignTest {
request
.
setDateUtc
(
Lists
.
newArrayList
(
ZonedDateTime
.
of
(
LocalDateTime
.
of
(
2020
,
6
,
30
,
0
,
0
),
ZoneOffset
.
UTC
).
toString
(),
request
.
setDateUtc
(
Lists
.
newArrayList
(
ZonedDateTime
.
of
(
LocalDateTime
.
of
(
2020
,
6
,
30
,
0
,
0
),
ZoneOffset
.
UTC
).
toString
(),
ZonedDateTime
.
of
(
LocalDateTime
.
of
(
2020
,
7
,
30
,
0
,
0
),
ZoneOffset
.
UTC
).
toString
()));
ZonedDateTime
.
of
(
LocalDateTime
.
of
(
2020
,
7
,
30
,
0
,
0
),
ZoneOffset
.
UTC
).
toString
()));
AdminResult
<
Map
<
String
,
Object
>>
result
=
adminFeign
.
revenueSumApi
(
request
);
AdminResult
<
List
<
Map
<
String
,
Object
>
>>
result
=
adminFeign
.
revenueSumApi
(
request
);
log
.
info
(
JsonUtilByJackson
.
writeValueAsString
(
result
));
log
.
info
(
JsonUtilByJackson
.
writeValueAsString
(
result
));
}
}
...
...
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