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 192ad01cc..8c18ea143 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java @@ -1349,27 +1349,27 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc } 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)); - } +// 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); @@ -1384,13 +1384,13 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc } - Map finalChaddMap = chaddMap; - Map finalChlesMap = chlesMap; +// Map finalChaddMap = chaddMap; +// Map finalChlesMap = chlesMap; Map finalUserTagsMap = userTagsMap; Map finalTagMap = tagMap; list.stream().forEach(u->{ - u.setAddCredit(finalChaddMap.get(u.getId())); - u.setLesCredit(finalChlesMap.get(u.getId())); +// 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()),"/");