|
|
|
@@ -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<InvestTaskDao, |
|
|
|
Collection<WxShop> shops = shopService.getByIds(taskList.stream().map(InvestTaskEntity::getTargetId).collect(Collectors.toList())); |
|
|
|
Map<Long, WxShop> shopsMap = shops.stream().collect(Collectors.toMap(WxShop::getId, shop -> shop)); |
|
|
|
|
|
|
|
//3、用户信息 |
|
|
|
Collection<MallUserInfo> users = userInfoService.findList(null); |
|
|
|
Map<Long, MallUserInfo> usersMap = users.parallelStream().collect(Collectors.toMap(MallUserInfo::getId, MallUserInfo -> MallUserInfo)); |
|
|
|
List<InvestTaskVo> 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<InvestTaskDao, |
|
|
|
return investPage; |
|
|
|
} |
|
|
|
|
|
|
|
private InvestTaskVo buildResultItem(InvestTaskEntity item, WxShop shop) { |
|
|
|
private InvestTaskVo buildResultItem(InvestTaskEntity item, WxShop shop, Map<Long, MallUserInfo> usersMap) { |
|
|
|
List<MallUserInfo> ownerInfo = Lists.newArrayList(); |
|
|
|
List<Long> 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; |
|
|
|
|