diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestPageQuery.java b/mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestPageQuery.java index bb5c13137..b5d131c64 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestPageQuery.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestPageQuery.java @@ -7,10 +7,10 @@ import java.util.List; @Data public class InvestPageQuery { @io.swagger.annotations.ApiModelProperty(value = "当前页", name = "pageNum", example = "1") - private Integer pageNum; + private Integer pageNum = 1; @io.swagger.annotations.ApiModelProperty(value = "每页数据", name = "pageSize", example = "10") - private Integer pageSize; + private Integer pageSize = 10; @io.swagger.annotations.ApiModelProperty(value = "倒序字段集合", name = "descs") diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestTaskVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestTaskVo.java index b17d7b0d9..d5e4cc866 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestTaskVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestTaskVo.java @@ -1,9 +1,12 @@ package com.iformall.domain.vo.invest; import com.iformall.domain.po.InvestTaskEntity; +import com.iformall.domain.po.MallUserInfo; import lombok.Builder; import lombok.Data; +import java.util.List; + @Data @Builder public class InvestTaskVo extends InvestTaskEntity { @@ -13,4 +16,6 @@ public class InvestTaskVo extends InvestTaskEntity { */ @io.swagger.annotations.ApiModelProperty(value = "targetInfo", name = "targetInfo") private T targetInfo; + + private List ownerInfo ; } diff --git a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestTaskServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestTaskServiceImpl.java index ee77ebb27..5068969a8 100755 --- a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestTaskServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestTaskServiceImpl.java @@ -1,11 +1,13 @@ package com.iformall.service.invest.impl; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.iformall.common.TableLog; import com.iformall.domain.po.InvestTaskEntity; +import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.WxShop; import com.iformall.domain.vo.invest.InvestPageQuery; import com.iformall.domain.vo.invest.InvestPageResult; @@ -16,6 +18,8 @@ import com.iformall.service.WxShopService; import com.iformall.service.invest.InvestHelper; import com.iformall.service.invest.InvestTaskService; import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.compress.utils.Lists; +import org.apache.poi.ss.formula.ptg.MemAreaPtg; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -53,10 +57,13 @@ public class InvestTaskServiceImpl extends InvestBaseServiceImpl shops = shopService.getByIds(taskList.stream().map(InvestTaskEntity::getTargetId).collect(Collectors.toList())); Map shopsMap = shops.stream().collect(Collectors.toMap(WxShop::getId, shop -> shop)); + //3、用户信息 + Collection users = userInfoService.findList(null); + Map usersMap = users.parallelStream().collect(Collectors.toMap(MallUserInfo::getId, MallUserInfo -> MallUserInfo)); List resultList = new ArrayList<>(); for (InvestTaskEntity item : taskList) { WxShop shop = shopsMap.get(item.getTargetId()); - resultList.add(buildResultItem(item, shop)); + resultList.add(buildResultItem(item, shop, usersMap)); } BeanUtils.copyProperties(taskPage, investPage); @@ -65,9 +72,17 @@ public class InvestTaskServiceImpl extends InvestBaseServiceImpl usersMap) { + List ownerInfo = Lists.newArrayList(); + List ownerList = JSON.parseArray(item.getOwner(), Long.class); + if (CollectionUtils.isNotEmpty(ownerList)) { + for (Long userId : ownerList) { + ownerInfo.add(usersMap.get(userId)); + } + } InvestTaskVo resultItemVo = InvestTaskVo.builder() .targetInfo(shop) + .ownerInfo(ownerInfo) .build(); BeanUtils.copyProperties(item, resultItemVo); return resultItemVo;