4.0报表

src/main/java/com/gogirl/infrastructure/feign/AdminFeign.java

@@ -33,17 +33,23 @@ public interface AdminFeign {
             produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     AdminResult<List<Map<String, Object>>> getStoreListApi(@RequestBody GetStoreListApiRequest request);
 
+
     @PostMapping(value = "/api/Report/PreStorageSumApi",
             consumes = MediaType.APPLICATION_JSON_UTF8_VALUE,
             produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     AdminResult<Map<String, Object>> preStorageSumApi(@RequestBody PreStorageSumApiRequest request);
 
-    @PostMapping(value = "/api/ReportTable/RevenueTypeListApi",
+    @PostMapping(value = "/api/Report/RevenueSumByTypeApi",
+            consumes = MediaType.APPLICATION_JSON_UTF8_VALUE,
+            produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    AdminResult<Map<String, Object>> revenueSumByTypeApi(@RequestBody RevenueSumByTypeApiRequest request);
+
+    @PostMapping(value = "/api/Report/RevenueTypeListApi",
             consumes = MediaType.APPLICATION_JSON_UTF8_VALUE,
             produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     AdminResult<List<Map<String, Object>>> revenueTypeListApi(@RequestBody RevenueTypeListRequest request);
 
-    @PostMapping(value = "/api/ReportTable/RevenueSumApi",
+    @PostMapping(value = "/api/Report/RevenueSumApi",
             consumes = MediaType.APPLICATION_JSON_UTF8_VALUE,
             produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     AdminResult<Map<String, Object>> revenueSumApi(@RequestBody RevenueSumApiRequest request);
@@ -69,6 +75,11 @@ public interface AdminFeign {
         }
 
         @Override
+        public AdminResult<Map<String, Object>> revenueSumByTypeApi(RevenueSumByTypeApiRequest request) {
+            return new AdminResult<>();
+        }
+
+        @Override
         public AdminResult<List<Map<String, Object>>> revenueTypeListApi(RevenueTypeListRequest request) {
             return new AdminResult<>();
         }

src/main/java/com/gogirl/shared/admin/dashboard/req/RevenueSumApiRequest.java

@@ -19,6 +19,4 @@ public class RevenueSumApiRequest {
     @JsonProperty("date_utc")
     private List<String> dateUtc;
 
-    @JsonProperty("user_store_ids")
-    private List<Integer> userStoreIds;
 }

src/test/java/com/gogirl/infrastructure/feign/AdminFeignTest.java

@@ -2,10 +2,7 @@ package com.gogirl.infrastructure.feign;
 
 import com.gogirl.infrastructure.common.util.JsonUtilByJackson;
 import com.gogirl.shared.admin.AdminResult;
-import com.gogirl.shared.admin.dashboard.req.GetStoreListApiRequest;
-import com.gogirl.shared.admin.dashboard.req.GetStoreTrendApiRequest;
-import com.gogirl.shared.admin.dashboard.req.RevenueSumApiRequest;
-import com.gogirl.shared.admin.dashboard.req.RevenueTypeListRequest;
+import com.gogirl.shared.admin.dashboard.req.*;
 import com.gogirl.shared.admin.dashboard.resp.GetStoreTrendApiResp;
 import lombok.extern.slf4j.Slf4j;
 import org.assertj.core.util.Lists;
@@ -60,6 +57,7 @@ public class AdminFeignTest {
     }
 
 
+    @Test
     public void getStoreListApi() {
 
         GetStoreListApiRequest request = new GetStoreListApiRequest();
@@ -73,6 +71,7 @@ public class AdminFeignTest {
     }
 
 
+    @Test
     public void preStorageSumApi() {
 
         GetStoreListApiRequest request = new GetStoreListApiRequest();
@@ -85,9 +84,19 @@ public class AdminFeignTest {
 
     }
 
+    @Test
+    public void revenueSumByTypeApi() {
+        RevenueSumByTypeApiRequest request = new RevenueSumByTypeApiRequest();
+        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()));
+
+        AdminResult<Map<String, Object>> result = adminFeign.revenueSumByTypeApi(request);
+        log.info(JsonUtilByJackson.writeValueAsString(result));
+    }
+
+    @Test
     public void revenueTypeListApi() {
         RevenueTypeListRequest request = new RevenueTypeListRequest();
-
         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()));
 
@@ -96,6 +105,7 @@ public class AdminFeignTest {
     }
 
 
+    @Test
     public void revenueSumApi() {
         RevenueSumApiRequest request = new RevenueSumApiRequest();
         request.setDateUtc(Lists.newArrayList(ZonedDateTime.of(LocalDateTime.of(2020, 6, 30, 0, 0), ZoneOffset.UTC).toString(),