bugfix:2576我的动态

alien-store/src/main/java/shop/alien/store/service/LifeUserDynamicsService.java

@@ -570,18 +570,15 @@ public class LifeUserDynamicsService extends ServiceImpl<LifeUserDynamicsMapper,
 
         // TODO  bugfix: 过滤掉我拉黑的和拉黑我的。
         //是否关注用户
-        String targetPhone;
         LifeUser myLifeUser = new LifeUser();
         StoreUser myStoreUser = new StoreUser();
 
         if ("user".equals(phoneId.split("_")[0])) {
             String myselfUserPhone = phoneId.split("_")[1];
             myLifeUser = lifeUserService.getUserByPhone(myselfUserPhone);
-            targetPhone = myLifeUser.getUserPhone();
         } else {
             String myselfStorePhone = phoneId.split("_")[1];
             myStoreUser = storeUserService.getUserByPhone(myselfStorePhone);
-            targetPhone = myStoreUser.getPhone();
         }
 
         Integer myType ;
@@ -620,7 +617,9 @@ public class LifeUserDynamicsService extends ServiceImpl<LifeUserDynamicsMapper,
                 if (lifeUserDynamicsVo.getType().equals("2")){
                     String phoneIdNew = lifeUserDynamicsVo.getPhoneId().substring(6);
                      StoreInfo storeInfo=storeInfoMapper.getStoreNameByPhone(phoneIdNew);
-                    lifeUserDynamicsVo.setStoreName(storeInfo.getStoreName());
+                     if(storeInfo != null){
+                         lifeUserDynamicsVo.setStoreName(storeInfo.getStoreName());
+                     }
                 } else if (lifeUserDynamicsVo.getType().equals("1")) {
                     String phoneIdNew = lifeUserDynamicsVo.getPhoneId().substring(5);
                     //根据手机号查询用户表

alien-store/src/main/java/shop/alien/store/service/impl/CommonCommentServiceImpl.java

@@ -274,10 +274,11 @@ public class CommonCommentServiceImpl extends ServiceImpl<CommonCommentMapper, C
             // 2.查询商家头像 TODO -> 动态发布的时候id不应该用Store_phone的格式，来不及重构动态的位置，后续等有缘人吧
             StoreUser storeUser = storeUserMapper.selectOne(new QueryWrapper<StoreUser>().eq("phone", lifeUserDynamics.getPhoneId().split("_")[1]));
             map.put("userImage",storeUser.getHeadImg()!= null?storeUser.getHeadImg():"");
+            LifeUser lifeUser = lifeUserMapper.selectById(userId);
             // 3.查询当前用户是否喜欢
             LifeLikeRecord lifeLikeRecord = lifeLikeRecordMapper.selectOne(new QueryWrapper<LifeLikeRecord>()
                     .eq("type", CommonConstant.LIKE_TYPE_DYNAMICS)
-                    .eq("dianzan_id", userId)
+                    .eq("dianzan_id", "user_".concat(lifeUser.getUserPhone()))
                     .eq("huifu_id", sourceId)
                     .eq("delete_flag", 0));
             if(null != lifeLikeRecord){
@@ -286,7 +287,7 @@ public class CommonCommentServiceImpl extends ServiceImpl<CommonCommentMapper, C
                 map.put("isLike",0);
             }
             // 4.查询当前登录人是否关注了动态发布者
-            LifeUser lifeUser = lifeUserMapper.selectById(userId);
+
             LifeFans lifeFans = lifeFansMapper.selectOne(new QueryWrapper<LifeFans>().eq("followed_id", lifeUserDynamics.getPhoneId())
                     .eq("fans_id", "user_".concat(lifeUser.getUserPhone()))
                     .eq("fans_type", 1)