ufo / yohoufo-fore · Commits

Go to a project

Authored by caoyan
Commit 007ec691211d3ab0b4ca9ad8a2f0451c50ed0a8a 2 parents 760f870f 36829e0e

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

Inline Side-by-side
Showing 1 changed file with 8 additions and 8 deletions
... ... @@ -154,10 +154,8 @@ public class ProductIdentifyServiceImpl implements ProductIdentifyService{
private static final String UIC_PROFILE_URL = "/profile/getProfile";
public static final String DEFAULT_HEAD_IMG_1 = "http://img11.static.yhbimg.com/yhb-img01/2016/07/05/13/017ec560b82c132ab2fdb22f7cf6f42b83.png?imageView/{mode}/w/{width}/h/{height}";
public static final String DEFAULT_HEAD_IMG = "http://img11.static.yhbimg.com/yhb-img01/2016/07/05/13/017ec560b82c132ab2fdb22f7cf6f42b83.png?imageView/{mode}/w/{width}/h/{height}";
public static final String DEFAULT_HEAD_IMG_2 = "http://head.static.yhbimg.com/yhb-head/2018/12/28/14/0160773bb87685aade796ea4f94e0587cf.png?imageView2/{mode}/w/{width}/h/{height}";
private static final String DEFAULT_FROM = "YOHO!";
public static final Integer OPERATE_TYPE_APPLYING = 0;//申请中
... ... @@ -274,7 +272,7 @@ public class ProductIdentifyServiceImpl implements ProductIdentifyService{
mobileMask = buyerInfo.getNickName();
}
String headIcon = buyerInfo.getHeadIco();
if(DEFAULT_HEAD_IMG_1.equals(headIcon) || StringUtils.isBlank(headIcon)){//有货的默认头像
if(DEFAULT_HEAD_IMG.equals(headIcon) || StringUtils.isBlank(headIcon)){//有货的默认头像
//ufo 用户的默认头像
headIcon = configReader.getString("ufo.product.defaultUserHeadIcon", "http://head.static.yhbimg.com/yhb-head/2018/12/28/14/0160773bb87685aade796ea4f94e0587cf.png?imageView2/{mode}/w/{width}/h/{height}");
}
... ... @@ -599,9 +597,10 @@ public class ProductIdentifyServiceImpl implements ProductIdentifyService{
track.setType(MESSAGE_TYPE_APPLICANT);
track.setContent(getContent(profileInfo));
String headIcon = profileInfo.getHead_ico();
if(DEFAULT_HEAD_IMG_1.equals(headIcon) || DEFAULT_HEAD_IMG_2.equals(headIcon) || StringUtils.isBlank(headIcon)){//有货的默认头像
if(DEFAULT_HEAD_IMG.equals(headIcon) || StringUtils.isBlank(headIcon)){//有货的默认头像
//ufo 用户的默认头像
headIcon = configReader.getString("ufo.product.defaultUserHeadIcon", "http://img12.static.yhbimg.com/article/2019/02/26/16/02456ade977d8dfdbc4ca548b196c1d62b.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}");
headIcon = "http://img12.static.yhbimg.com/article/2019/02/26/16/02456ade977d8dfdbc4ca548b196c1d62b.png?imageView2/{mode}/w/{width}/h/{height}";
}
track.setHeadIcon(headIcon);
... ... @@ -660,9 +659,10 @@ public class ProductIdentifyServiceImpl implements ProductIdentifyService{
item.setUid(toUid);
item.setContent(getContent(profileMap.get(toUid)));
String headIcon = profileMap.get(toUid).getHead_ico();
if(DEFAULT_HEAD_IMG_1.equals(headIcon) || DEFAULT_HEAD_IMG_2.equals(headIcon) || StringUtils.isBlank(headIcon)){//有货的默认头像
if(DEFAULT_HEAD_IMG_1.equals(headIcon) || StringUtils.isBlank(headIcon)){//有货的默认头像
//ufo 用户的默认头像
headIcon = configReader.getString("ufo.product.defaultUserHeadIcon", "http://img12.static.yhbimg.com/article/2019/02/26/16/02456ade977d8dfdbc4ca548b196c1d62b.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}");
headIcon = "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);
... ...