Authored by caoyan

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

... ... @@ -599,7 +599,7 @@ public class ProductIdentifyServiceImpl implements ProductIdentifyService{
String headIcon = profileInfo.getHead_ico();
if(DEFAULT_HEAD_IMG.equals(headIcon) || StringUtils.isBlank(headIcon)){//有货的默认头像
//ufo 用户的默认头像
headIcon = configReader.getString("ufo.product.defaultUserHeadIcon", "http://img11.static.yhbimg.com/goodsimg/2019/02/26/16/01f05294027c419a10bb4a941cae257692.png?imageView2/{mode}/w/{width}/h/{height}");
headIcon = configReader.getString("ufo.product.defaultUserHeadIcon", "http://img12.static.yhbimg.com/article/2019/02/26/16/02456ade977d8dfdbc4ca548b196c1d62b.png?imageView2/{mode}/w/{width}/h/{height}");
}
track.setHeadIcon(headIcon);
... ... @@ -631,7 +631,7 @@ public class ProductIdentifyServiceImpl implements ProductIdentifyService{
int authTime = identifyRecord.getAuthTime();
identifyTrack.setTime(authTime);
identifyTrack.setTimeStr(formatDate(authTime, "yyyy.MM.dd HH:mm:ss"));
identifyTrack.setContent(authGroup + "鉴定结果为\"真\"");
identifyTrack.setContent(authGroup.substring(0, 7) + "鉴定结果为\"真\"");
identifyTrack.setType(MESSAGE_TYPE_JUDGE_INFO);
//鉴定中心,默认的展示头像
String authIco = configReader.getString("ufo.product.defaultAuthHeadIcon", "http://head.static.yhbimg.com/yhb-head/2018/12/28/14/01384244a3ca86fa5345df87c59317b81f.png?imageView2/{mode}/w/{width}/h/{height}");
... ... @@ -660,7 +660,7 @@ public class ProductIdentifyServiceImpl implements ProductIdentifyService{
String headIcon = profileMap.get(toUid).getHead_ico();
if(DEFAULT_HEAD_IMG.equals(headIcon) || StringUtils.isBlank(headIcon)){//有货的默认头像
//ufo 用户的默认头像
headIcon = configReader.getString("ufo.product.defaultUserHeadIcon", "http://img11.static.yhbimg.com/goodsimg/2019/02/26/16/01f05294027c419a10bb4a941cae257692.png?imageView2/{mode}/w/{width}/h/{height}");
headIcon = configReader.getString("ufo.product.defaultUserHeadIcon", "http://img12.static.yhbimg.com/article/2019/02/26/16/02456ade977d8dfdbc4ca548b196c1d62b.png?imageView2/{mode}/w/{width}/h/{height}");
}
item.setHeadIcon(headIcon);
item.setType(MESSAGE_TYPE_EX_OWNER);
... ... @@ -929,5 +929,5 @@ public class ProductIdentifyServiceImpl implements ProductIdentifyService{
}
return tmp;
}
}
... ...