diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java index 1a0e02d51..8b08e7afa 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java @@ -1347,67 +1347,68 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc if (null == list || list.size() <= 0 ) { return null; } - List userIds = wxCUserBasicInfoMapper.findVoIdsList1(tenantInfo,basicInfo); - if (null != userIds && userIds.size() > 0 ) { - WxCreditHistory chaddq = new WxCreditHistory(); - chaddq.setUserIdList(userIds); - chaddq.setTenantId(tenantInfo.getFinalTenantId()); - chaddq.setStartTime(basicInfo.getCreditStartTime()); - chaddq.setEndTime(basicInfo.getCreditEndTime()); - List chadds = creditHistoryMapper.findAddList(chaddq); - Map chaddMap = new HashMap<>(); - if(null != chadds){ - chaddMap = chadds.stream().collect(Collectors.toMap(WxCreditHistory::getCUserId, WxCreditHistory::getCreditNum)); - } - - WxCreditHistory chlesq = new WxCreditHistory(); - chlesq.setUserIdList(userIds); - chlesq.setTenantId(tenantInfo.getFinalTenantId()); - chlesq.setStartTime(basicInfo.getCreditStartTime()); - chlesq.setEndTime(basicInfo.getCreditEndTime()); - List chless = creditHistoryMapper.findLesList(chlesq); - Map chlesMap = new HashMap<>(); - if(null != chless){ - chlesMap = chless.stream().collect(Collectors.toMap(WxCreditHistory::getCUserId, WxCreditHistory::getCreditNum)); - } - -// WxCUserTags tq = new WxCUserTags(); -// tq.setUserIdList(userIds); -// tq.setTenantId(tenantInfo.getFinalTenantId()); -// List userTagList = wxCUserTagsMapper.findList(tq); -// Map tagMap = new HashMap<>(); -// Map userTagsMap = new HashMap<>(); -// if (null != userTagList) { -// List tagList = wxTagsMapper.findListAll(); -// tagMap = tagList.stream().collect(Collectors.toMap(WxTags::getId, WxTags::getName)); -// userTagsMap = userTagList.stream().collect(Collectors.toMap(WxCUserTags::getUserId, WxCUserTags::getTags)); + +// List userIds = wxCUserBasicInfoMapper.findVoIdsList1(tenantInfo,basicInfo); +// if (null != userIds && userIds.size() > 0 ) { +// WxCreditHistory chaddq = new WxCreditHistory(); +// chaddq.setUserIdList(userIds); +// chaddq.setTenantId(tenantInfo.getFinalTenantId()); +// chaddq.setStartTime(basicInfo.getCreditStartTime()); +// chaddq.setEndTime(basicInfo.getCreditEndTime()); +// List chadds = creditHistoryMapper.findAddList(chaddq); +// Map chaddMap = new HashMap<>(); +// if(null != chadds){ +// chaddMap = chadds.stream().collect(Collectors.toMap(WxCreditHistory::getCUserId, WxCreditHistory::getCreditNum)); +// } +// +// WxCreditHistory chlesq = new WxCreditHistory(); +// chlesq.setUserIdList(userIds); +// chlesq.setTenantId(tenantInfo.getFinalTenantId()); +// chlesq.setStartTime(basicInfo.getCreditStartTime()); +// chlesq.setEndTime(basicInfo.getCreditEndTime()); +// List chless = creditHistoryMapper.findLesList(chlesq); +// Map chlesMap = new HashMap<>(); +// if(null != chless){ +// chlesMap = chless.stream().collect(Collectors.toMap(WxCreditHistory::getCUserId, WxCreditHistory::getCreditNum)); +// } +// +//// WxCUserTags tq = new WxCUserTags(); +//// tq.setUserIdList(userIds); +//// tq.setTenantId(tenantInfo.getFinalTenantId()); +//// List userTagList = wxCUserTagsMapper.findList(tq); +//// Map tagMap = new HashMap<>(); +//// Map userTagsMap = new HashMap<>(); +//// if (null != userTagList) { +//// List tagList = wxTagsMapper.findListAll(); +//// tagMap = tagList.stream().collect(Collectors.toMap(WxTags::getId, WxTags::getName)); +//// userTagsMap = userTagList.stream().collect(Collectors.toMap(WxCUserTags::getUserId, WxCUserTags::getTags)); +//// +//// } +// +// List tagList = wxTagsMapper.findListAll(); // -// } - - List tagList = wxTagsMapper.findListAll(); - - Map finalChaddMap = chaddMap; - Map finalChlesMap = chlesMap; -// Map finalUserTagsMap = userTagsMap; - Map finalTagMap = tagList.stream().collect(Collectors.toMap(WxTags::getId, WxTags::getName));; - list.stream().forEach(u->{ - u.setAddCredit(finalChaddMap.get(u.getId())); - u.setLesCredit(finalChlesMap.get(u.getId())); - if(StringUtils.isNotBlank(u.getTags())){ - List ids = JSONObject.parseArray(u.getTags(), Long.class); - if (null != ids) { - String tagNames = StringUtils.join(ids.stream().map(id-> finalTagMap.get(id)).collect(Collectors.toList()),"/"); - u.setTagNames(tagNames); - } - } -// List ids = JSONObject.parseArray(finalUserTagsMap.get(u.getId()), Long.class); -// if (null != ids) { -// String tagNames = StringUtils.join(ids.stream().map(id-> finalTagMap.get(id)).collect(Collectors.toList()),"/"); -// u.setTagNames(tagNames); +// Map finalChaddMap = chaddMap; +// Map finalChlesMap = chlesMap; +//// Map finalUserTagsMap = userTagsMap; +// Map finalTagMap = tagList.stream().collect(Collectors.toMap(WxTags::getId, WxTags::getName));; +// list.stream().forEach(u->{ +// u.setAddCredit(finalChaddMap.get(u.getId())); +// u.setLesCredit(finalChlesMap.get(u.getId())); +// if(StringUtils.isNotBlank(u.getTags())){ +// List ids = JSONObject.parseArray(u.getTags(), Long.class); +// if (null != ids) { +// String tagNames = StringUtils.join(ids.stream().map(id-> finalTagMap.get(id)).collect(Collectors.toList()),"/"); +// u.setTagNames(tagNames); +// } // } - }); - - } +//// List ids = JSONObject.parseArray(finalUserTagsMap.get(u.getId()), Long.class); +//// if (null != ids) { +//// String tagNames = StringUtils.join(ids.stream().map(id-> finalTagMap.get(id)).collect(Collectors.toList()),"/"); +//// u.setTagNames(tagNames); +//// } +// }); +// +// } if (null != list && list.size() > 0 ) { List retList = new ArrayList(); retList.addAll(list); diff --git a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml index f40ec5114..139ff3515 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml @@ -650,7 +650,7 @@ distinct cu.`id`,cu.`phone`,cu.`birthdate`,cu.`education`,cu.`sex`,cu.`email`,cu.`address`,cu.`poins`,cu.`tag_id`, cu.`create_date`,cu.`update_date`,cu.`name`,cu.`level`,cu.`nick_name`, - cut.`tags`, + cu.`credit`,cu.`active_time`,cu.`act_record`,cu.`final_tenant_id` @@ -849,7 +849,7 @@ from wx_c_user_basic_info cu - left join wx_c_user_tags${basicInfo.shardFinalTableSuffix} cut on cut.`id` = cu.`tag_id` + limit #{basicInfo.begin}, #{basicInfo.limit}