Commit ccbb303e by guojx

店长/店员 任务列表添加导购头像

parent 7ad3e20d
...@@ -2,6 +2,8 @@ package com.gic.haoban.manage.web.controller.data; ...@@ -2,6 +2,8 @@ package com.gic.haoban.manage.web.controller.data;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.gic.api.base.commons.Page; import com.gic.api.base.commons.Page;
import com.gic.clerk.api.dto.ClerkDTO;
import com.gic.clerk.api.service.ClerkService;
import com.gic.commons.util.DataApiUtils; import com.gic.commons.util.DataApiUtils;
import com.gic.commons.webapi.reponse.RestResponse; import com.gic.commons.webapi.reponse.RestResponse;
import com.gic.haoban.manage.api.service.StaffApiService; import com.gic.haoban.manage.api.service.StaffApiService;
...@@ -19,6 +21,7 @@ import org.springframework.web.bind.annotation.RestController; ...@@ -19,6 +21,7 @@ import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream; import java.util.stream.Stream;
...@@ -33,6 +36,8 @@ public class CanvasDataController { ...@@ -33,6 +36,8 @@ public class CanvasDataController {
private EsMemberInfoUtils esMemberInfoUtils; private EsMemberInfoUtils esMemberInfoUtils;
@Autowired @Autowired
private StaffApiService staffApiService; private StaffApiService staffApiService;
@Autowired
private ClerkService clerkService;
/** /**
* 活动转化数据 * 活动转化数据
...@@ -164,6 +169,17 @@ public class CanvasDataController { ...@@ -164,6 +169,17 @@ public class CanvasDataController {
Map<String, Object> res = DataApiUtils.http(jsonObject.toJSONString(), "data_mkt_canvas_haoban_mkt_task"); Map<String, Object> res = DataApiUtils.http(jsonObject.toJSONString(), "data_mkt_canvas_haoban_mkt_task");
Page<CanvasStoreTaskVO> page = DataApiUtils.getPageData(res, CanvasStoreTaskVO.class); Page<CanvasStoreTaskVO> page = DataApiUtils.getPageData(res, CanvasStoreTaskVO.class);
List<CanvasStoreTaskVO> list = page.getResult();
if (CollectionUtils.isNotEmpty(list)) {
Set<String> clerkIdList = list.stream().filter(e -> StringUtils.isNotBlank(e.getClerkId())).map(e -> e.getClerkId()).collect(Collectors.toSet());
if (CollectionUtils.isNotEmpty(clerkIdList)) {
List<ClerkDTO> clerkList = clerkService.getClerkByClerkIds(clerkIdList);
Map<String, String> clerkIdMapHeadImage = clerkList.stream().collect(Collectors.toMap(e -> e.getClerkId(), e -> e.getHeadImgUrl()));
for (CanvasStoreTaskVO vo : list) {
vo.setClerkImageUrl(clerkIdMapHeadImage.get(vo.getClerkId()));
}
}
}
return RestResponse.successResult(page); return RestResponse.successResult(page);
} }
......
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