修改关注系统通知+点赞系统通知+实名认证通知

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

@@ -83,7 +83,8 @@ public class LifeCommentService {
 
     private final ClockInRecommendCacheService clockInRecommendCacheService;
 
-    private final TypeUtil typeUtil;
+    private TypeUtil typeUtil;
+
     /**
      * 系统app通知开关
      */
@@ -325,6 +326,12 @@ public class LifeCommentService {
             lifeNotice.setTitle("动态通知");
             lifeNotice.setContext("点赞了你的动态");
             LifeUserDynamics lifeUserDynamics = lifeUserDynamicsMapper.selectById(Integer.parseInt(huifuId));
+
+            //系统通知，只修改接收人的 id和类型
+            PhoneTypeIdResult phoneTypeIdResult =typeUtil.resolveTypeAndId(lifeUserDynamics == null ? null : lifeUserDynamics.getPhoneId());
+            lifeNotice.setReceiverUserType(phoneTypeIdResult.getType());
+            lifeNotice.setSenderRefId(phoneTypeIdResult.getId());
+
             lifeNotice.setReceiverId(lifeUserDynamics == null ? null : lifeUserDynamics.getPhoneId());
             lifeNoticeMapper.insert(lifeNotice);
         }

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

@@ -39,6 +39,8 @@ import shop.alien.store.service.clockin.ClockInRecommendCacheService;
 import shop.alien.store.service.dynamics.DynamicsRecommendCacheService;
 import shop.alien.store.feign.SecondServiceFeign;
 import shop.alien.store.util.FunctionMagic;
+import shop.alien.util.type.PhoneTypeIdResult;
+import shop.alien.util.type.TypeUtil;
 
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
@@ -105,6 +107,9 @@ public class LifeUserService extends ServiceImpl<LifeUserMapper, LifeUser> {
 
     private final JdbcTemplate jdbcTemplate;
 
+
+    private TypeUtil typeUtil;
+
     @Autowired
     private RiskControlProperties riskControlProperties;
 
@@ -291,6 +296,12 @@ public class LifeUserService extends ServiceImpl<LifeUserMapper, LifeUser> {
         notice.setReceiverId(fans.getFollowedId());
         notice.setSenderId(fans.getFansId());
 
+        if (fans.getFollowedId().contains("_")){
+            PhoneTypeIdResult phoneTypeIdResult =typeUtil.resolveTypeAndId(fans.getFollowedId());
+            notice.setReceiverUserType(phoneTypeIdResult.getType());
+            notice.setSenderRefId(phoneTypeIdResult.getId());
+        }
+
         String storePhones = "''";
         String userPhones = "''";
         String sid = fans.getFansId();
@@ -532,6 +543,14 @@ public class LifeUserService extends ServiceImpl<LifeUserMapper, LifeUser> {
         String receiverId = "user_" + user.getUserPhone();
         LifeNotice lifeNotice = new LifeNotice();
         lifeNotice.setReceiverId(receiverId);
+
+        if (receiverId.contains("_")){
+            PhoneTypeIdResult phoneTypeIdResult =typeUtil.resolveTypeAndId(receiverId);
+            lifeNotice.setReceiverUserType(phoneTypeIdResult.getType());
+            lifeNotice.setReceiverRefId(phoneTypeIdResult.getId());
+        }
+
+
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         String storeDate = simpleDateFormat.format(new Date());
         String text = "您在" + storeDate + "实名认证成功。";