xhxu 4 лет назад
Родитель
Сommit
e035f8e514
3 измененных файлов: 8 добавлений и 10 удалений
  1. +2
    -2
      mallinkService/src/main/java/com/iformall/service/WxCUserTagsService.java
  2. +3
    -5
      mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java
  3. +3
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java

+ 2
- 2
mallinkService/src/main/java/com/iformall/service/WxCUserTagsService.java Просмотреть файл

@@ -56,9 +56,9 @@ public interface WxCUserTagsService {

/**
* 获取标签id------标签name map
* @param tenantInfo
* @param tenantId
* @param tagIds
* @return
*/
Map<Long, String> findIdTagNames(TenantEntity tenantInfo, List<Long> tagIds);
Map<Long, String> findIdTagNames(String tenantId, List<Long> tagIds);
}

+ 3
- 5
mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java Просмотреть файл

@@ -823,6 +823,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc
// String tagNames = StringUtils.join(ids.stream().map(id->tagMap.get(id)).collect(Collectors.toList()),"/");
// u.setTagNames(tagNames);
// });

excelService.exportBigExcel(this,basicInfo, null, "会员信息", WxCUserBasicInfoVo.class, "会员信息数据.xlsx", response, false);
}

@@ -1244,14 +1245,11 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc

@Override
public List<Object> selectListForExcelExport(Object queryParams, int page) {
Map params = (Map) queryParams;
WxCUserBasicInfo basicInfo = (WxCUserBasicInfo) params.get("basicInfo");
TenantEntity tenantInfo = (TenantEntity) params.get("tenantInfo");
WxCUserBasicInfo basicInfo = (WxCUserBasicInfo) queryParams;
List<WxCUserBasicInfoVo> list = new ArrayList<WxCUserBasicInfoVo>();
basicInfo.setBegin((page-1)*20000);
basicInfo.setLimit(20000);

basicInfo.undateFinalTenantId(tenantInfo);
list = wxCUserBasicInfoMapper.findVoList(basicInfo);
if (null == list || list.size() <= 0 ) {
return null;
@@ -1283,7 +1281,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc

//处理会员标签
List<Long> tagIds = list.stream().map(cc -> cc.getTagId()).collect(Collectors.toList());
Map<Long, String> tagIdName = wxCUserTagsService.findIdTagNames(tenantInfo,tagIds);
Map<Long, String> tagIdName = wxCUserTagsService.findIdTagNames(basicInfo.getFinalTenantId(),tagIds);
list.stream().forEach(u->{
// u.setAddCredit(finalChaddMap.get(u.getId()));
// u.setLesCredit(finalChlesMap.get(u.getId()));


+ 3
- 3
mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java Просмотреть файл

@@ -331,17 +331,17 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService {
}

@Override
public Map<Long, String> findIdTagNames(TenantEntity tenantInfo, List<Long> tagIds) {
public Map<Long, String> findIdTagNames(String tenantId, List<Long> tagIds) {
Map<Long, String> tagIdName = new HashMap<>();
if(tagIds == null || tagIds.isEmpty()){
return tagIdName;
}
WxCUserTags userTagsQ = new WxCUserTags();
userTagsQ.updateTenantInfo(tenantInfo);
userTagsQ.setTenantId(tenantId);
userTagsQ.setIds(tagIds);
List<WxCUserTags> userTagsList = wxCUserTagsMapper.findList(userTagsQ);
List<WxTags> tagList = wxTagsMapper.findListAll(tenantInfo.getTenantId());
List<WxTags> tagList = wxTagsMapper.findListAll(tenantId);
Map<Long, String> finalTagMap = tagList.stream().collect(Collectors.toMap(WxTags::getId, WxTags::getName));
for (WxCUserTags wct:userTagsList) {
if(StringUtils.isNotBlank(wct.getTags())){


Загрузка…
Отмена
Сохранить