Kaynağa Gözat

[招商]adjust

release_toaliyun_real
Burce 6 yıl önce
ebeveyn
işleme
39deaedf90
3 değiştirilmiş dosya ile 24 ekleme ve 4 silme
  1. +2
    -2
      mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestPageQuery.java
  2. +5
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestTaskVo.java
  3. +17
    -2
      mallinkService/src/main/java/com/iformall/service/invest/impl/InvestTaskServiceImpl.java

+ 2
- 2
mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestPageQuery.java Dosyayı Görüntüle

@@ -7,10 +7,10 @@ import java.util.List;
@Data
public class InvestPageQuery<T> {
@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")


+ 5
- 0
mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestTaskVo.java Dosyayı Görüntüle

@@ -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<T> extends InvestTaskEntity {
@@ -13,4 +16,6 @@ public class InvestTaskVo<T> extends InvestTaskEntity {
*/
@io.swagger.annotations.ApiModelProperty(value = "targetInfo", name = "targetInfo")
private T targetInfo;

private List<MallUserInfo> ownerInfo ;
}

+ 17
- 2
mallinkService/src/main/java/com/iformall/service/invest/impl/InvestTaskServiceImpl.java Dosyayı Görüntüle

@@ -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;


Yükleniyor…
İptal
Kaydet