fix

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

@@ -13,10 +13,7 @@ import com.gogirl.shared.admin.techcnian.AdminTechnicianScoreResp;
 import com.gogirl.shared.admin.techcnian.GetTechnicianPageRequest;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.util.List;
@@ -43,16 +40,19 @@ public class DashboardController {
 
     @ApiOperation("见doc文档getStoreTrendApi")
     @PostMapping("/no_getStoreTrendApi")
-    public JsonResult<GetStoreTrendApiResp> getStoreTrendApi(@RequestBody GetStoreTrendApiRequest request) {
-
+    public JsonResult<GetStoreTrendApiResp> getStoreTrendApi(@RequestBody GetStoreTrendApiRequest request,
+                                                             @RequestHeader("brandId") Integer brandId) {
 
+        request.setApi_brand_id(brandId);
         GetStoreTrendApiResp resp = dashboardService.getStoreTrendApi(request);
         return JsonResult.success(resp);
     }
 
     @ApiOperation("见doc文档getStoreListApi")
     @PostMapping("/no_getStoreListApi")
-    public JsonResult<List<Map<String, Object>>> getStoreListApi(@RequestBody GetStoreListApiRequest request) {
+    public JsonResult<List<Map<String, Object>>> getStoreListApi(@RequestBody GetStoreListApiRequest request,
+                                                                 @RequestHeader("brandId") Integer brandId) {
+        request.setApi_brand_id(brandId);
         List<Map<String, Object>> result = dashboardService.getStoreListApi(request);
         return JsonResult.success(result);
 
@@ -60,7 +60,9 @@ public class DashboardController {
 
     @ApiOperation("见doc文档preStorageSumApi")
     @PostMapping("/no_preStorageSumApi")
-    public JsonResult<Map<String, Object>> preStorageSumApi(@RequestBody PreStorageSumApiRequest request) {
+    public JsonResult<Map<String, Object>> preStorageSumApi(@RequestBody PreStorageSumApiRequest request,
+                                                            @RequestHeader("brandId") Integer brandId) {
+        request.setApi_brand_id(brandId);
         Map<String, Object> result = dashboardService.preStorageSumApi(request);
         return JsonResult.success(result);
 
@@ -69,7 +71,9 @@ public class DashboardController {
 
     @ApiOperation("见doc文档revenueSumByTypeApi")
     @PostMapping(value = "/api/Report/no_revenueSumByTypeApi")
-    public JsonResult<Map<String, Object>> revenueSumByTypeApi(@RequestBody RevenueSumByTypeApiRequest request) {
+    public JsonResult<Map<String, Object>> revenueSumByTypeApi(@RequestBody RevenueSumByTypeApiRequest request,
+                                                               @RequestHeader("brandId") Integer brandId) {
+        request.setApi_brand_id(brandId);
         Map<String, Object> result = dashboardService.revenueSumByTypeApi(request);
         return JsonResult.success(result);
     }
@@ -77,7 +81,9 @@ public class DashboardController {
 
     @ApiOperation("见doc文档revenueTypeListApi")
     @PostMapping("/no_revenueTypeListApi")
-    public JsonResult<List<Map<String, Object>>> revenueTypeListApi(@RequestBody RevenueTypeListRequest request) {
+    public JsonResult<List<Map<String, Object>>> revenueTypeListApi(@RequestBody RevenueTypeListRequest request,
+                                                                    @RequestHeader("brandId") Integer brandId) {
+        request.setApi_brand_id(brandId);
         List<Map<String, Object>> result = dashboardService.revenueTypeListApi(request);
         return JsonResult.success(result);
     }
@@ -85,7 +91,9 @@ public class DashboardController {
 
     @ApiOperation("见doc文档revenueSumApi")
     @PostMapping("/no_revenueSumApi")
-    public JsonResult<List<Map<String, Object>>> revenueSumApi(@RequestBody RevenueSumApiRequest request) {
+    public JsonResult<List<Map<String, Object>>> revenueSumApi(@RequestBody RevenueSumApiRequest request,
+                                                               @RequestHeader("brandId") Integer brandId) {
+        request.setApi_brand_id(brandId);
         List<Map<String, Object>> result = dashboardService.revenueSumApi(request);
         return JsonResult.success(result);
     }
@@ -93,7 +101,9 @@ public class DashboardController {
 
     @ApiOperation("美甲师信息")
     @PostMapping("/no_getTechnicianPage")
-    public JsonResult<AdminPage<AdminTechnicianScoreResp>> getTechnicianPage(@RequestBody GetTechnicianPageRequest request) {
+    public JsonResult<AdminPage<AdminTechnicianScoreResp>> getTechnicianPage(@RequestBody GetTechnicianPageRequest request,
+                                                                             @RequestHeader("brandId") Integer brandId) {
+        request.setApi_brand_id(brandId);
         AdminPage<AdminTechnicianScoreResp> respAdminPage = dashboardService.getTechnicianPage(request);
         return JsonResult.success(respAdminPage);
     }
@@ -101,7 +111,9 @@ public class DashboardController {
 
     @ApiOperation("美甲师业绩")
     @PostMapping("/no_achievementsPersonaResultPageApi")
-    public JsonResult<AdminPage<AchievementsPersonaResult>> achievementsPersonaResultPageApi(@RequestBody AchievementsPersonaResultPageApiRequest request) {
+    public JsonResult<AdminPage<AchievementsPersonaResult>> achievementsPersonaResultPageApi(@RequestBody AchievementsPersonaResultPageApiRequest request,
+                                                                                             @RequestHeader("brandId") Integer brandId) {
+        request.setApi_brand_id(brandId);
         AdminPage<AchievementsPersonaResult> page = dashboardService.achievementsPersonaResultPageApi(request);
         return JsonResult.success(page);
     }

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

@@ -25,6 +25,6 @@ public class GetStoreListApiRequest extends AdminPageRequest {
     @JsonProperty("user_store_ids")
     private List<Integer> userStoreIds;
 
-    private Integer api_brand_id = 1;
+    private Integer api_brand_id;
 
 }

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

@@ -27,5 +27,5 @@ public class GetStoreTrendApiRequest {
     @JsonProperty("user_store_ids")
     private List<Integer> userStoreIds;
 
-    private Integer api_brand_id = 1;
+    private Integer api_brand_id;
 }

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

@@ -22,6 +22,6 @@ public class PreStorageSumApiRequest {
     @JsonProperty("user_store_ids")
     private List<Integer> userStoreIds;
 
-    private Integer api_brand_id = 1;
+    private Integer api_brand_id;
 
 }

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

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

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

@@ -19,6 +19,6 @@ public class RevenueSumByTypeApiRequest {
     @JsonProperty("date_utc")
     private List<String> dateUtc;
 
-    private Integer api_brand_id = 1;
+    private Integer api_brand_id;
 
 }

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

@@ -22,6 +22,6 @@ public class RevenueTypeListRequest {
     @JsonProperty("user_store_ids")
     private List<Integer> userStoreIds;
 
-    private Integer api_brand_id = 1;
+    private Integer api_brand_id;
 
 }