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

@@ -33,7 +33,7 @@ public enum CacheEnum {
     /**
      * 消息盒子-消息，缓存5分钟
      */
-    USERS_INBOX_LIST("yh:users:inbox_list", 5 * 60, "users.cachetime.inbox_list"),
+    USERS_INBOX_VO_LIST("yh:users:inbox_vo_list", 5 * 60, "users.cachetime.inbox_list"),
 
     /**
      * 消息盒子-消息总数，缓存5分钟

@@ -496,7 +496,7 @@ public class ProductIdentifyServiceImpl implements ProductIdentifyService{
 	
     private void deleteIboxsByRedis(int uid, String type){
     	logger.info("deleteIboxsByRedis params uid is {} type is {}",uid,type);
-        RedisKeyBuilder inboxKey = CacheEnum.USERS_INBOX_LIST.generateKey(uid);
+        RedisKeyBuilder inboxKey = CacheEnum.USERS_INBOX_VO_LIST.generateKey(uid);
         redisTemplate.delete(inboxKey);
         RedisKeyBuilder key = CacheEnum.USERS_INBOX_TYPE_UNREADCOUNT.generateKey(uid,type);
         redisTemplate.delete(key);
@@ -644,8 +644,11 @@ public class ProductIdentifyServiceImpl implements ProductIdentifyService{
 			IdentifyTrackResp item = new IdentifyTrackResp();
 			Integer toUid = Integer.parseInt(record.getToUid());
 			item.setUid(toUid);
-			String mobileMask = MobileHelper.coverMobile2(profileMap.get(toUid).getMobile());//隐位的手机号码--隐藏中间6位
-			item.setContent(StringUtils.isEmpty(profileMap.get(toUid).getNickname()) ? mobileMask : profileMap.get(toUid).getNickname());
+			String content = profileMap.get(toUid).getNickname();
+			if(StringUtils.isEmpty(content) || content.startsWith("YOHO-")) {
+				content = MobileHelper.coverMobile2(profileMap.get(toUid).getMobile());//隐位的手机号码--隐藏中间6位
+			}
+			item.setContent(content);
 			String headIcon = profileMap.get(toUid).getHead_ico();
 			if(DEFAULT_HEAD_IMG.equals(headIcon) || StringUtils.isBlank(headIcon)){//有货的默认头像
 				//ufo 用户的默认头像

@@ -22,7 +22,7 @@ public enum CacheEnum {
     /**
      * 消息盒子-消息，缓存5分钟
      */
-    USERS_INBOX_VO_LIST("yh:users:inbox_vo_list", 5 * 60, "users.cachetime.inbox_vo_list"),
+    USERS_INBOX_VO_LIST("yh:users:inbox_vo_list", 5 * 60, "users.cachetime.inbox_list"),
 
     /**
      * 消息盒子-消息总数，缓存5分钟