4.0报表

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

 package com.gogirl.infrastructure.feign;
 
 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.PreStorageSumApiRequest;
+import com.gogirl.shared.admin.dashboard.req.*;
 import com.gogirl.shared.admin.dashboard.resp.GetStoreTrendApiResp;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
@@ -35,11 +33,22 @@ public interface AdminFeign {
             produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     AdminResult<List<Map<String, Object>>> getStoreListApi(@RequestBody GetStoreListApiRequest request);
 
-    @PostMapping(value = "/api/ReportTable/GetStoreListApi",
+    @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",
+            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",
+            consumes = MediaType.APPLICATION_JSON_UTF8_VALUE,
+            produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    AdminResult<Map<String, Object>> revenueSumApi(@RequestBody RevenueSumApiRequest request);
+
+
     @Component
     class AdminFeignFallback implements AdminFeign {
 
@@ -56,7 +65,17 @@ public interface AdminFeign {
 
         @Override
         public AdminResult<Map<String, Object>> preStorageSumApi(PreStorageSumApiRequest request) {
-            return null;
+            return new AdminResult<>();
+        }
+
+        @Override
+        public AdminResult<List<Map<String, Object>>> revenueTypeListApi(RevenueTypeListRequest request) {
+            return new AdminResult<>();
+        }
+
+        @Override
+        public AdminResult<Map<String, Object>> revenueSumApi(RevenueSumApiRequest request) {
+            return new AdminResult<>();
         }
     }
 }

src/main/java/com/gogirl/interfaces/dashboard/DashboardController.java

 package com.gogirl.interfaces.dashboard;
 
+import com.gogirl.infrastructure.common.base.JsonResult;
+import com.gogirl.infrastructure.feign.AdminFeign;
+import com.gogirl.shared.admin.dashboard.req.*;
+import com.gogirl.shared.admin.dashboard.resp.GetStoreTrendApiResp;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  *
@@ -11,8 +21,38 @@ import org.springframework.web.bind.annotation.RestController;
  * @author robbendev
  * @since 2020/8/17 9:09 上午
  */
+@Api(tags = "4.0报表")
 @RestController
-@RequestMapping("/technician")
-public class DashboardController {
+@RequestMapping("/technician/dashboard")
+public class DashboardController  {
+    @Resource
+    AdminFeign adminFeign
+
+    @PostMapping("/getStoreTrendApi")
+    public JsonResult<GetStoreTrendApiResp> getStoreTrendApi(GetStoreTrendApiRequest request) {
+        return JsonResult.success(adminFeign.getStoreTrendApi(request).getData());
+    }
+
+    @PostMapping("/getStoreListApi")
+    public JsonResult<List<Map<String, Object>>> getStoreListApi(GetStoreListApiRequest request) {
+        return JsonResult.success(adminFeign.getStoreListApi(request).getData());
+
+    }
+
+    @PostMapping("/preStorageSumApi")
+    public JsonResult<Map<String, Object>> preStorageSumApi(PreStorageSumApiRequest request) {
+        return JsonResult.success(adminFeign.preStorageSumApi(request).getData());
+
+    }
+
+    @PostMapping("/revenueTypeListApi")
+    public JsonResult<List<Map<String, Object>>> revenueTypeListApi(RevenueTypeListRequest request) {
+        return JsonResult.success(adminFeign.revenueTypeListApi(request).getData());
+
+    }
 
+    @PostMapping("/revenueSumApi")
+    public JsonResult<Map<String, Object>> revenueSumApi(RevenueSumApiRequest request) {
+        return JsonResult.success(adminFeign.revenueSumApi(request).getData());
+    }
 }

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

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

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

+package com.gogirl.shared.admin.dashboard.req;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020/8/17 5:14 下午
+ */
+@Data
+public class RevenueSumApiRequest {
+
+    @JsonProperty("date_utc")
+    private List<String> dateUtc;
+
+    @JsonProperty("user_store_ids")
+    private List<Integer> userStoreIds;
+}

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

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

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

@@ -54,6 +54,25 @@ public class AdminFeignTest {
         log.info(JsonUtilByJackson.writeValueAsString(result));
     }
 
+
+    public void getStoreListApi() {
+
+    }
+
+
+    public void preStorageSumApi() {
+
+    }
+
+    public void revenueTypeListApi() {
+
+    }
+
+
+    public void revenueSumApi() {
+
+    }
+
     @Test
     public void testTime() {
         System.out.println(LocalDateTime.now(ZoneOffset.UTC).toString());