Commit a8c8e2b7 by huluobin

update

parent 76be0544
package com.gogirl.interfaces.dashboard; package com.gogirl.interfaces.dashboard;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.gogirl.application.store.store.StoreManageService;
import com.gogirl.domain.store.store.StoreManage;
import com.gogirl.infrastructure.common.base.JsonResult; import com.gogirl.infrastructure.common.base.JsonResult;
import com.gogirl.infrastructure.feign.AdminFeign; import com.gogirl.infrastructure.feign.AdminFeign;
import com.gogirl.shared.admin.AdminPage; import com.gogirl.shared.admin.AdminPage;
...@@ -70,10 +73,20 @@ public class DashboardController { ...@@ -70,10 +73,20 @@ public class DashboardController {
} }
@Resource
StoreManageService storeManageService;
@ApiOperation("见doc文档revenueSumApi") @ApiOperation("见doc文档revenueSumApi")
@PostMapping("/no_revenueSumApi") @PostMapping("/no_revenueSumApi")
public JsonResult<List<Map<String, Object>>> revenueSumApi(@RequestBody RevenueSumApiRequest request) { public JsonResult<List<Map<String, Object>>> revenueSumApi(@RequestBody RevenueSumApiRequest request) {
return JsonResult.success(adminFeign.revenueSumApi(request).getData()); List<Map<String, Object>> data = adminFeign.revenueSumApi(request).getData();
data.forEach(stringObjectMap -> {
String storeName = String.valueOf(stringObjectMap.get("store_name"));
StoreManage storeManage = storeManageService.getOne(new LambdaQueryWrapper<StoreManage>()
.eq(StoreManage::getName, storeName));
stringObjectMap.put("departmentId", storeManage == null ? 0 : storeManage.getId());
});
return JsonResult.success();
} }
......
...@@ -80,12 +80,11 @@ public class AdminFeignTest { ...@@ -80,12 +80,11 @@ public class AdminFeignTest {
@Test @Test
public void preStorageSumApi() { public void preStorageSumApi() {
GetStoreListApiRequest request = new GetStoreListApiRequest(); PreStorageSumApiRequest request = new PreStorageSumApiRequest();
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()));
request.setTitle("2"); AdminResult<Map<String, Object>> result = adminFeign.preStorageSumApi(request);
AdminResult<List<Map<String, Object>>> result = adminFeign.getStoreListApi(request);
log.info(JsonUtilByJackson.writeValueAsString(result)); log.info(JsonUtilByJackson.writeValueAsString(result));
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment