From 00d6ed165d38e5f8008d0de564955396084ea6f8 Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 10 Jun 2021 17:29:57 +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 | 50 +++++++++---------- 1 file changed, 25 insertions(+), 25 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 a28275664..1a0e02d51 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); @@ -1386,13 +1386,13 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc List tagList = wxTagsMapper.findListAll(); -// Map finalChaddMap = chaddMap; -// Map finalChlesMap = chlesMap; + 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())); + 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) {