Authored by caoyan

Merge branch 'dev_物权转移' into test6.8.6

... ... @@ -192,7 +192,8 @@ public class InBoxServiceImpl implements IInBoxService {
InBoxVO vo = new InBoxVO();
BeanUtils.copyProperties(item, vo);
voList.add(vo);
if(item.getType().intValue() == 2 && item.getBusinessType().intValue() == 2016) {//物权转移站内信,需特殊处理
if(item.getType().intValue() == InboxBusinessTypeEnum.NOTICE_BUYER_WHEN_OWNER_CONFIRM.getType().intValue()
&& item.getBusinessType().intValue() == InboxBusinessTypeEnum.NOTICE_BUYER_WHEN_OWNER_CONFIRM.getBusinessType().intValue()) {//物权转移站内信,需特殊处理
identifyInboxIdList.add(item.getId());
}
}
... ... @@ -207,7 +208,8 @@ public class InBoxServiceImpl implements IInBoxService {
}
Map<Integer, String> attrMap = attrList.stream().collect(Collectors.toMap(InBoxAttr::getInboxId, InBoxAttr::getJsonContent));
for(InBoxVO vo : voList) {
if(vo.getType().intValue() == 2 && vo.getBusinessType().intValue() == 2016) {
if(vo.getType().intValue() == InboxBusinessTypeEnum.NOTICE_BUYER_WHEN_OWNER_CONFIRM.getType().intValue()
&& vo.getBusinessType().intValue() == InboxBusinessTypeEnum.NOTICE_BUYER_WHEN_OWNER_CONFIRM.getBusinessType().intValue()) {
if(StringUtils.isEmpty(attrMap.get(vo.getId()))) {
continue;
}
... ...