From 2354403bc4220bb339e50f6e52c9bdb7472e8b4a Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 10 Jun 2021 17:23:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E5=91=98=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/WxCUserBasicInfoServiceImpl.java | 45 +++++++++++-------- .../mapper/WxCUserBasicInfoMapper.xml | 4 +- 2 files changed, 29 insertions(+), 20 deletions(-) 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 8c18ea143..a28275664 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java @@ -1371,31 +1371,40 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc // 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)); - - } +// 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(); // Map finalChaddMap = chaddMap; // Map finalChlesMap = chlesMap; - Map finalUserTagsMap = userTagsMap; - Map finalTagMap = tagMap; +// 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())); - 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(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); +// } }); } diff --git a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml index 139ff3515..f40ec5114 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}