Browse Source

ceshi

release_toaliyun_real
xhxu 5 years ago
parent
commit
0b9964a931
2 changed files with 62 additions and 61 deletions
  1. +60
    -59
      mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java
  2. +2
    -2
      mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml

+ 60
- 59
mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java View File

@@ -1347,67 +1347,68 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc
if (null == list || list.size() <= 0 ) {
return null;
}
List<Long> 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<WxCreditHistory> chadds = creditHistoryMapper.findAddList(chaddq);
Map<Long, Integer> 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<WxCreditHistory> chless = creditHistoryMapper.findLesList(chlesq);
Map<Long, Integer> 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<WxCUserTags> userTagList = wxCUserTagsMapper.findList(tq);
// Map<Long, String> tagMap = new HashMap<>();
// Map<Long, String> userTagsMap = new HashMap<>();
// if (null != userTagList) {
// List<WxTags> tagList = wxTagsMapper.findListAll();
// tagMap = tagList.stream().collect(Collectors.toMap(WxTags::getId, WxTags::getName));
// userTagsMap = userTagList.stream().collect(Collectors.toMap(WxCUserTags::getUserId, WxCUserTags::getTags));

// List<Long> 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<WxCreditHistory> chadds = creditHistoryMapper.findAddList(chaddq);
// Map<Long, Integer> 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<WxCreditHistory> chless = creditHistoryMapper.findLesList(chlesq);
// Map<Long, Integer> 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<WxCUserTags> userTagList = wxCUserTagsMapper.findList(tq);
//// Map<Long, String> tagMap = new HashMap<>();
//// Map<Long, String> userTagsMap = new HashMap<>();
//// if (null != userTagList) {
//// List<WxTags> tagList = wxTagsMapper.findListAll();
//// tagMap = tagList.stream().collect(Collectors.toMap(WxTags::getId, WxTags::getName));
//// userTagsMap = userTagList.stream().collect(Collectors.toMap(WxCUserTags::getUserId, WxCUserTags::getTags));
////
//// }
//
// List<WxTags> tagList = wxTagsMapper.findListAll();
//
// }

List<WxTags> tagList = wxTagsMapper.findListAll();

Map<Long, Integer> finalChaddMap = chaddMap;
Map<Long, Integer> finalChlesMap = chlesMap;
// Map<Long, String> finalUserTagsMap = userTagsMap;
Map<Long, String> 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<Long> 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<Long> 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<Long, Integer> finalChaddMap = chaddMap;
// Map<Long, Integer> finalChlesMap = chlesMap;
//// Map<Long, String> finalUserTagsMap = userTagsMap;
// Map<Long, String> 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<Long> 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<Long> 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<Object> retList = new ArrayList<Object>();
retList.addAll(list);


+ 2
- 2
mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml View File

@@ -650,7 +650,7 @@
<sql id="allVoColumns">
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`,
<!-- cut.`tags`,-->
cu.`credit`,cu.`active_time`,cu.`act_record`,cu.`final_tenant_id`
</sql>

@@ -849,7 +849,7 @@
<!-- and credit.create_date &lt; #{basicInfo.creditEndTime}-->
<!-- </if>) as lesCredit-->
from wx_c_user_basic_info cu
left join wx_c_user_tags${basicInfo.shardFinalTableSuffix} cut on cut.`id` = cu.`tag_id`
<!-- left join wx_c_user_tags${basicInfo.shardFinalTableSuffix} cut on cut.`id` = cu.`tag_id`-->
<include refid="dynamicVoWhereConditions1"/>
<if test=" null != basicInfo.begin ">
limit #{basicInfo.begin}, #{basicInfo.limit}


Loading…
Cancel
Save