ufo / yohoufo-fore · Commits

Go to a project

Authored by caoyan
Commit 3ace149bc624d2887c090a28f236828081f97359 2 parents d6425349 ca0838ef

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

Inline Side-by-side
Showing 3 changed files with 8 additions and 5 deletions
@@ -33,7 +33,7 @@ public enum CacheEnum { @@ -33,7 +33,7 @@ public enum CacheEnum {
33 /** 33 /**
34 * 消息盒子-消息，缓存5分钟 34 * 消息盒子-消息，缓存5分钟
35 */ 35 */
36 - USERS_INBOX_LIST("yh:users:inbox_list", 5 * 60, "users.cachetime.inbox_list"), 36 + USERS_INBOX_VO_LIST("yh:users:inbox_vo_list", 5 * 60, "users.cachetime.inbox_list"),
37 37
38 /** 38 /**
39 * 消息盒子-消息总数，缓存5分钟 39 * 消息盒子-消息总数，缓存5分钟
@@ -496,7 +496,7 @@ public class ProductIdentifyServiceImpl implements ProductIdentifyService{ @@ -496,7 +496,7 @@ public class ProductIdentifyServiceImpl implements ProductIdentifyService{
496 496
497 private void deleteIboxsByRedis(int uid, String type){ 497 private void deleteIboxsByRedis(int uid, String type){
498 logger.info("deleteIboxsByRedis params uid is {} type is {}",uid,type); 498 logger.info("deleteIboxsByRedis params uid is {} type is {}",uid,type);
499 - RedisKeyBuilder inboxKey = CacheEnum.USERS_INBOX_LIST.generateKey(uid); 499 + RedisKeyBuilder inboxKey = CacheEnum.USERS_INBOX_VO_LIST.generateKey(uid);
500 redisTemplate.delete(inboxKey); 500 redisTemplate.delete(inboxKey);
501 RedisKeyBuilder key = CacheEnum.USERS_INBOX_TYPE_UNREADCOUNT.generateKey(uid,type); 501 RedisKeyBuilder key = CacheEnum.USERS_INBOX_TYPE_UNREADCOUNT.generateKey(uid,type);
502 redisTemplate.delete(key); 502 redisTemplate.delete(key);
@@ -644,8 +644,11 @@ public class ProductIdentifyServiceImpl implements ProductIdentifyService{ @@ -644,8 +644,11 @@ public class ProductIdentifyServiceImpl implements ProductIdentifyService{
644 IdentifyTrackResp item = new IdentifyTrackResp(); 644 IdentifyTrackResp item = new IdentifyTrackResp();
645 Integer toUid = Integer.parseInt(record.getToUid()); 645 Integer toUid = Integer.parseInt(record.getToUid());
646 item.setUid(toUid); 646 item.setUid(toUid);
647 - String mobileMask = MobileHelper.coverMobile2(profileMap.get(toUid).getMobile());//隐位的手机号码--隐藏中间6位  
648 - item.setContent(StringUtils.isEmpty(profileMap.get(toUid).getNickname()) ? mobileMask : profileMap.get(toUid).getNickname()); 647 + String content = profileMap.get(toUid).getNickname();
  648 + if(StringUtils.isEmpty(content) || content.startsWith("YOHO-")) {
  649 + content = MobileHelper.coverMobile2(profileMap.get(toUid).getMobile());//隐位的手机号码--隐藏中间6位
  650 + }
  651 + item.setContent(content);
649 String headIcon = profileMap.get(toUid).getHead_ico(); 652 String headIcon = profileMap.get(toUid).getHead_ico();
650 if(DEFAULT_HEAD_IMG.equals(headIcon) || StringUtils.isBlank(headIcon)){//有货的默认头像 653 if(DEFAULT_HEAD_IMG.equals(headIcon) || StringUtils.isBlank(headIcon)){//有货的默认头像
651 //ufo 用户的默认头像 654 //ufo 用户的默认头像
@@ -22,7 +22,7 @@ public enum CacheEnum { @@ -22,7 +22,7 @@ public enum CacheEnum {
22 /** 22 /**
23 * 消息盒子-消息，缓存5分钟 23 * 消息盒子-消息，缓存5分钟
24 */ 24 */
25 - USERS_INBOX_VO_LIST("yh:users:inbox_vo_list", 5 * 60, "users.cachetime.inbox_vo_list"), 25 + USERS_INBOX_VO_LIST("yh:users:inbox_vo_list", 5 * 60, "users.cachetime.inbox_list"),
26 26
27 /** 27 /**
28 * 消息盒子-消息总数，缓存5分钟 28 * 消息盒子-消息总数，缓存5分钟