修改除了store服务下所有的发送站内信

alien-store/src/main/java/shop/alien/store/util/LifeNoticeUtil.java → alien-entity/src/main/java/shop/alien/util/type/LifeNoticeUtil.java

@@ -1,11 +1,9 @@
-package shop.alien.store.util;
+package shop.alien.util.type;
 
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
 import org.springframework.util.StringUtils;
 import shop.alien.entity.store.LifeNotice;
-import shop.alien.util.type.PhoneTypeIdResult;
-import shop.alien.util.type.TypeUtil;
 
 /**
  * LifeNotice 发送人/接收人 userType、refId 回填工具。

alien-job/src/main/java/shop/alien/job/second/AiCheckXxlJob.java

@@ -28,6 +28,7 @@ import shop.alien.mapper.*;
 import shop.alien.mapper.second.SecondGoodsRecordMapper;
 import shop.alien.mapper.second.SecondRiskControlRecordMapper;
 import shop.alien.util.common.Constants;
+import shop.alien.util.type.LifeNoticeUtil;
 
 import java.net.SocketException;
 import java.util.*;
@@ -86,6 +87,8 @@ public class AiCheckXxlJob {
 
     private final LifeNoticeMapper lifeNoticeMapper;
 
+    private final LifeNoticeUtil lifeNoticeUtil;
+
     /**
      * AI自动审核任务处理器
      * <p>
@@ -312,6 +315,7 @@ public class AiCheckXxlJob {
                                         lifeMessage.setSenderId("system");
                                         lifeMessage.setIsRead(0);
                                         lifeMessage.setNoticeType(1);
+                                        lifeNoticeUtil.fillUserTypeAndRefId(lifeMessage);
                                         lifeNoticeMapper.insert(lifeMessage);
                                     }
                                 }

alien-job/src/main/java/shop/alien/job/second/AiProductComplaintJob.java

@@ -20,6 +20,7 @@ import shop.alien.entity.store.LifeNotice;
 import shop.alien.entity.store.LifeUser;
 import shop.alien.entity.store.LifeUserViolation;
 import shop.alien.mapper.LifeNoticeMapper;
+import shop.alien.util.type.LifeNoticeUtil;
 import shop.alien.mapper.LifeUserMapper;
 import shop.alien.mapper.LifeUserViolationMapper;
 
@@ -45,6 +46,8 @@ public class AiProductComplaintJob {
     private final LifeUserMapper lifeUserMapper;
     private final LifeNoticeMapper lifeNoticeMapper;
 
+    private final LifeNoticeUtil lifeNoticeUtil;
+
     @Value("${third-party-user-name-admin.base-url}")
     private String userName;
 
@@ -181,6 +184,7 @@ public class AiProductComplaintJob {
                     lifeMessage.setSenderId("system");
                     lifeMessage.setIsRead(0);
                     lifeMessage.setNoticeType(1);
+                    lifeNoticeUtil.fillUserTypeAndRefId(lifeMessage);
                     lifeNoticeMapper.insert(lifeMessage);
                 }
 

alien-job/src/main/java/shop/alien/job/second/AiUserViolationJob.java

@@ -23,6 +23,7 @@ import shop.alien.entity.second.SecondUserCredit;
 import shop.alien.entity.second.SecondUserCreditRecord;
 import shop.alien.entity.store.*;
 import shop.alien.mapper.LifeNoticeMapper;
+import shop.alien.util.type.LifeNoticeUtil;
 import shop.alien.mapper.LifeUserMapper;
 import shop.alien.mapper.LifeUserViolationMapper;
 import shop.alien.mapper.second.SecondUserCreditMapper;
@@ -43,6 +44,8 @@ public class AiUserViolationJob {
     private final LifeUserMapper lifeUserMapper;
 
     private final LifeNoticeMapper lifeNoticeMapper;
+
+    private final LifeNoticeUtil lifeNoticeUtil;
     private final SecondUserCreditMapper secondUserCreditMapper;
     private final SecondUserCreditRecordMapper secondUserCreditRecordMapper;
 
@@ -193,6 +196,7 @@ public class AiUserViolationJob {
                     lifeMessage.setSenderId("system");
                     lifeMessage.setIsRead(0);
                     lifeMessage.setNoticeType(1);
+                    lifeNoticeUtil.fillUserTypeAndRefId(lifeMessage);
                     lifeNoticeMapper.insert(lifeMessage);
 
                     QueryWrapper<LifeUserViolation> queryWrapper = new QueryWrapper<>();

alien-job/src/main/java/shop/alien/job/second/SecondGoodsTradeXxlJob.java

@@ -20,6 +20,7 @@ import shop.alien.entity.store.vo.WebSocketVo;
 import shop.alien.job.feign.AlienStoreFeign;
 import shop.alien.mapper.LifeMessageMapper;
 import shop.alien.mapper.LifeNoticeMapper;
+import shop.alien.util.type.LifeNoticeUtil;
 import shop.alien.mapper.LifeUserMapper;
 import shop.alien.mapper.second.SecondGoodsMapper;
 import shop.alien.mapper.second.SecondTradeOperationMapper;
@@ -41,6 +42,8 @@ public class SecondGoodsTradeXxlJob {
 
     private final LifeNoticeMapper lifeNoticeMapper;
 
+    private final LifeNoticeUtil lifeNoticeUtil;
+
     private final LifeUserMapper lifeUserMapper;
 
     private final LifeMessageMapper lifeMessageMapper;
@@ -119,6 +122,7 @@ public class SecondGoodsTradeXxlJob {
                 noticeMessage.put("otherSideImage", null == seller ? "" : seller.getUserImage());
                 noticeMessage.put("message", "您有一笔交易即将开始, 请及时前往查看");
                 lifeNotice.setContext(noticeMessage.toJSONString());
+                lifeNoticeUtil.fillUserTypeAndRefId(lifeNotice);
                 lifeNoticeMapper.insert(lifeNotice);
 
                 // 给买家推送通知
@@ -166,6 +170,7 @@ public class SecondGoodsTradeXxlJob {
                 noticeMessage.put("otherSideImage", null == buyer ? "" : buyer.getUserImage());
                 noticeMessage.put("message", "您有一笔交易即将开始, 请及时前往查看");
                 lifeNotice.setContext(noticeMessage.toJSONString());
+                lifeNoticeUtil.fillUserTypeAndRefId(lifeNotice);
                 lifeNoticeMapper.insert(lifeNotice);
 
                 // 给卖家推送通知
@@ -228,6 +233,7 @@ public class SecondGoodsTradeXxlJob {
                 noticeMessage.put("tradeStatus", tradeRecord.getTradeStatus());
                 noticeMessage.put("message", "您有一笔交易已完成, 请前往确认");
                 lifeNotice.setContext(noticeMessage.toJSONString());
+                lifeNoticeUtil.fillUserTypeAndRefId(lifeNotice);
                 lifeNoticeMapper.insert(lifeNotice);
 
                 // 给买家推送通知
@@ -249,6 +255,7 @@ public class SecondGoodsTradeXxlJob {
                 lifeNotice.setTitle("商品是否交易成功");
                 lifeNotice.setNoticeType(1);
                 lifeNotice.setContext(noticeMessage.toJSONString());
+                lifeNoticeUtil.fillUserTypeAndRefId(lifeNotice);
                 lifeNoticeMapper.insert(lifeNotice);
 
                 // 给卖家推送通知

alien-job/src/main/java/shop/alien/job/store/BadReviewAppealJob.java

@@ -24,6 +24,7 @@ import org.springframework.web.client.RestTemplate;
 import shop.alien.entity.store.*;
 import shop.alien.entity.result.R;
 import shop.alien.mapper.LifeNoticeMapper;
+import shop.alien.util.type.LifeNoticeUtil;
 import shop.alien.mapper.StoreCommentAppealMapper;
 import shop.alien.mapper.StoreCommentMapper;
 import shop.alien.mapper.StoreUserMapper;
@@ -63,6 +64,8 @@ public class BadReviewAppealJob {
     private final StoreCommentMapper storeCommentMapper;
     private final StoreUserMapper storeUserMapper;
     private final LifeNoticeMapper lifeNoticeMapper;
+
+    private final LifeNoticeUtil lifeNoticeUtil;
     private final CommonRatingMapper commonRatingMapper;
     private final CommonCommentMapper commonCommentMapper;
     private final LifeLikeRecordMapper lifeLikeRecordMapper;
@@ -237,6 +240,7 @@ public class BadReviewAppealJob {
                     lifeMessage.setSenderId("system");
                     lifeMessage.setIsRead(0);
                     lifeMessage.setNoticeType(1);
+                    lifeNoticeUtil.fillUserTypeAndRefId(lifeMessage);
                     int insertResult = lifeNoticeMapper.insert(lifeMessage);
                     if (insertResult > 0) {
                         log.info("申诉通知发送成功，申诉ID: {}，通知标题: {}", appeal.getId(), title);

alien-job/src/main/java/shop/alien/job/store/LifeCouponJob.java

@@ -10,6 +10,7 @@ import org.springframework.util.StringUtils;
 import shop.alien.entity.store.*;
 import shop.alien.mapper.*;
 import shop.alien.util.common.constant.DiscountCouponEnum;
+import shop.alien.util.type.LifeNoticeUtil;
 
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
@@ -36,6 +37,8 @@ public class LifeCouponJob {
     private final LifeDiscountCouponMapper lifeDiscountCouponMapper;
     private final LifeUserMapper lifeUserMapper;
     private final LifeNoticeMapper lifeNoticeMapper;
+
+    private final LifeNoticeUtil lifeNoticeUtil;
     private final StoreInfoMapper storeInfoMapper;
 
     /**
@@ -118,6 +121,7 @@ public class LifeCouponJob {
                 notice.setTitle("优惠券即将到期");
                 notice.setIsRead(0);
                 notice.setNoticeType(2);
+                lifeNoticeUtil.fillUserTypeAndRefId(notice);
                 lifeNoticeMapper.insert(notice);
                 sendCount++;
             } catch (Exception e) {

alien-job/src/main/java/shop/alien/job/store/LifeUserOrderJob.java

@@ -19,6 +19,7 @@ import shop.alien.util.common.constant.CouponTypeEnum;
 import shop.alien.util.common.constant.DiscountCouponEnum;
 import shop.alien.util.common.constant.OrderStatusEnum;
 import shop.alien.util.common.constant.PaymentEnum;
+import shop.alien.util.type.LifeNoticeUtil;
 
 import java.math.BigDecimal;
 import java.text.ParseException;
@@ -51,6 +52,8 @@ public class LifeUserOrderJob {
     private final LifeUserMapper lifeUserMapper;
     private final LifeNoticeMapper lifeNoticeMapper;
 
+    private final LifeNoticeUtil lifeNoticeUtil;
+
     /**
      * 待支付订单超时处理
      */
@@ -305,6 +308,7 @@ public class LifeUserOrderJob {
                                 lifeMessage.setSenderId("system");
                                 lifeMessage.setIsRead(0);
                                 lifeMessage.setNoticeType(2);
+                                lifeNoticeUtil.fillUserTypeAndRefId(lifeMessage);
                                 lifeNoticeMapper.insert(lifeMessage);
                             }
                         }

alien-lawyer/src/main/java/shop/alien/lawyer/service/impl/AiUserAuditTaskServiceImpl.java

@@ -29,6 +29,7 @@ import shop.alien.lawyer.service.LawyerUserViolationService;
 import shop.alien.lawyer.util.ali.AliApi;
 import shop.alien.mapper.LawyerConsultationOrderMapper;
 import shop.alien.mapper.LifeNoticeMapper;
+import shop.alien.util.type.LifeNoticeUtil;
 import shop.alien.mapper.LifeUserMapper;
 import shop.alien.mapper.LawyerUserMapper;
 import shop.alien.mapper.StoreUserMapper;
@@ -65,6 +66,8 @@ public class AiUserAuditTaskServiceImpl implements AiUserAuditTaskService {
 
     private final LifeNoticeMapper lifeNoticeMapper;
 
+    private final LifeNoticeUtil lifeNoticeUtil;
+
     private final WebSocketProcess webSocketProcess;
 
     private final LifeUserMapper lifeUserMapper;
@@ -350,6 +353,7 @@ public class AiUserAuditTaskServiceImpl implements AiUserAuditTaskService {
 
             // 创建并保存通知
             LifeNotice lifeNotice = createLifeNotice(violation.getId(), receiverId, "举报失败通知", message);
+            lifeNoticeUtil.fillUserTypeAndRefId(lifeNotice);
             lifeNoticeMapper.insert(lifeNotice);
 
             // 发送WebSocket消息
@@ -418,6 +422,7 @@ public class AiUserAuditTaskServiceImpl implements AiUserAuditTaskService {
 
             // 创建并保存通知
             LifeNotice lifeNotice = createLifeNotice(violation.getId(), receiverId, "举报成功通知", message);
+            lifeNoticeUtil.fillUserTypeAndRefId(lifeNotice);
             lifeNoticeMapper.insert(lifeNotice);
 
             // 发送WebSocket消息
@@ -451,6 +456,7 @@ public class AiUserAuditTaskServiceImpl implements AiUserAuditTaskService {
 
             // 创建并保存通知
             LifeNotice lifeNotice = createLifeNotice(violation.getId(), receiverId, "被举报成功通知", message);
+            lifeNoticeUtil.fillUserTypeAndRefId(lifeNotice);
             lifeNoticeMapper.insert(lifeNotice);
 
             // 发送WebSocket消息
@@ -647,6 +653,7 @@ public class AiUserAuditTaskServiceImpl implements AiUserAuditTaskService {
 
             // 发送退款到账通知
             LifeNotice refundArrivalNotice = createLifeNotice(order.getId(), receiverId, "退款到账通知", message);
+            lifeNoticeUtil.fillUserTypeAndRefId(refundArrivalNotice);
             lifeNoticeMapper.insert(refundArrivalNotice);
             sendWebSocketMessage(receiverId, refundArrivalNotice);
 

alien-lawyer/src/main/java/shop/alien/lawyer/service/impl/CommentAppealServiceImpl.java

@@ -23,6 +23,7 @@ import shop.alien.lawyer.service.OrderReviewService;
 import shop.alien.lawyer.service.ReviewCommentService;
 import shop.alien.util.common.JwtUtil;
 import shop.alien.util.common.ListToPage;
+import shop.alien.util.type.LifeNoticeUtil;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -45,6 +46,8 @@ public class CommentAppealServiceImpl extends ServiceImpl<CommentAppealMapper, C
     private final ReviewCommentService reviewCommentService;
     private final WebSocketProcess webSocketProcess;
     private final LifeNoticeMapper lifeNoticeMapper;
+
+    private final LifeNoticeUtil lifeNoticeUtil;
     private final OrderReviewMapper orderReviewMapper;
     private final LifeUserMapper lifeUserMapper;
     private final LawyerUserMapper lawyerUserMapper;
@@ -231,6 +234,7 @@ public class CommentAppealServiceImpl extends ServiceImpl<CommentAppealMapper, C
 //            jsonObject.put("status", "pending"); // 待审核状态
             lifeNotice.setContext(jsonObject.toJSONString());
 
+            lifeNoticeUtil.fillUserTypeAndRefId(lifeNotice);
             lifeNoticeMapper.insert(lifeNotice);
 
             // 发送 WebSocket 消息
@@ -295,6 +299,7 @@ public class CommentAppealServiceImpl extends ServiceImpl<CommentAppealMapper, C
             jsonObject.put("message", message);
             lifeNotice.setContext(jsonObject.toJSONString());
 
+            lifeNoticeUtil.fillUserTypeAndRefId(lifeNotice);
             lifeNoticeMapper.insert(lifeNotice);
 
             // 发送 WebSocket 消息
@@ -341,6 +346,7 @@ public class CommentAppealServiceImpl extends ServiceImpl<CommentAppealMapper, C
             jsonObject.put("message", message);
             lifeNotice.setContext(jsonObject.toJSONString());
 
+            lifeNoticeUtil.fillUserTypeAndRefId(lifeNotice);
             lifeNoticeMapper.insert(lifeNotice);
 
             // 发送 WebSocket 消息

alien-lawyer/src/main/java/shop/alien/lawyer/service/impl/LawyerClientConsultationOrderServiceImpl.java

@@ -28,6 +28,7 @@ import shop.alien.lawyer.service.OrderExpirationService;
 import shop.alien.mapper.*;
 import shop.alien.util.common.constant.LawyerStatusEnum;
 import shop.alien.util.common.constant.OrderActionType;
+import shop.alien.util.type.LifeNoticeUtil;
 
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
@@ -54,6 +55,8 @@ public class LawyerClientConsultationOrderServiceImpl extends ServiceImpl<Lawyer
     private final OrderExpirationService orderExpirationService;
     private final AlienStoreFeign alienStoreFeign;
     private final LifeNoticeMapper lifeNoticeMapper;
+
+    private final LifeNoticeUtil lifeNoticeUtil;
     private final LifeUserMapper lifeUserMapper;
     private final WebSocketProcess webSocketProcess;
     private final LifeMessageMapper lifeMessageMapper;
@@ -1355,6 +1358,7 @@ public class LawyerClientConsultationOrderServiceImpl extends ServiceImpl<Lawyer
 
             // 创建并保存通知
             LifeNotice lifeNotice = createRefundNotice(order.getId(), receiverId, "退款申请处理通知", message);
+            lifeNoticeUtil.fillUserTypeAndRefId(lifeNotice);
             int noticeResult = lifeNoticeMapper.insert(lifeNotice);
             if (noticeResult <= 0) {
                 log.warn("发送同意退款通知失败：保存通知失败，订单ID={}", order.getId());
@@ -1400,6 +1404,7 @@ public class LawyerClientConsultationOrderServiceImpl extends ServiceImpl<Lawyer
 
             // 创建并保存通知
             LifeNotice lifeNotice = createRefundNotice(order.getId(), receiverId, "拒绝退款通知", message);
+            lifeNoticeUtil.fillUserTypeAndRefId(lifeNotice);
             int noticeResult = lifeNoticeMapper.insert(lifeNotice);
             if (noticeResult <= 0) {
                 log.warn("发送拒绝退款通知失败：保存通知失败，订单ID={}", order.getId());
@@ -1530,6 +1535,7 @@ public class LawyerClientConsultationOrderServiceImpl extends ServiceImpl<Lawyer
 
             // 创建并保存通知
             LifeNotice lifeNotice = createOrderNotice(order.getId(), receiverId, "接单通知", message);
+            lifeNoticeUtil.fillUserTypeAndRefId(lifeNotice);
             int noticeResult = lifeNoticeMapper.insert(lifeNotice);
             if (noticeResult <= 0) {
                 log.warn("发送接单通知失败：保存通知失败，订单ID={}", order.getId());
@@ -1579,6 +1585,7 @@ public class LawyerClientConsultationOrderServiceImpl extends ServiceImpl<Lawyer
 
             // 创建并保存通知
             LifeNotice lifeNotice = createOrderNotice(order.getId(), receiverId, "拒绝接单通知", message);
+            lifeNoticeUtil.fillUserTypeAndRefId(lifeNotice);
             int noticeResult = lifeNoticeMapper.insert(lifeNotice);
             if (noticeResult <= 0) {
                 log.warn("发送拒绝接单通知失败：保存通知失败，订单ID={}", order.getId());
@@ -1622,6 +1629,7 @@ public class LawyerClientConsultationOrderServiceImpl extends ServiceImpl<Lawyer
 
             // 创建并保存通知
             LifeNotice lifeNotice = createOrderNotice(order.getId(), receiverId, "退款到账通知", message);
+            lifeNoticeUtil.fillUserTypeAndRefId(lifeNotice);
             int noticeResult = lifeNoticeMapper.insert(lifeNotice);
             if (noticeResult <= 0) {
                 log.warn("发送退款到账通知失败：保存通知失败，订单ID={}", order.getId());

alien-lawyer/src/main/java/shop/alien/lawyer/service/impl/LawyerConsultationOrderServiceImpl.java

@@ -31,6 +31,7 @@ import shop.alien.lawyer.service.OrderExpirationService;
 import shop.alien.lawyer.util.DateUtils;
 import shop.alien.mapper.*;
 import shop.alien.util.common.constant.LawyerStatusEnum;
+import shop.alien.util.type.LifeNoticeUtil;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
@@ -59,6 +60,8 @@ public class LawyerConsultationOrderServiceImpl extends ServiceImpl<LawyerConsul
 //    private final AliApi aliApi;
     private final LawFirmMapper lawFirmMapper;
     private final LifeNoticeMapper lifeNoticeMapper;
+
+    private final LifeNoticeUtil lifeNoticeUtil;
     private final LifeUserMapper lifeUserMapper;
     private final WebSocketProcess webSocketProcess;
 
@@ -1862,6 +1865,7 @@ public class LawyerConsultationOrderServiceImpl extends ServiceImpl<LawyerConsul
                 return;
             }
 
+            lifeNoticeUtil.fillUserTypeAndRefId(lifeNotice);
             int noticeResult = lifeNoticeMapper.insert(lifeNotice);
             if (noticeResult <= 0) {
                 log.warn("保存退款申请通知失败，订单ID={}, 用户ID={}", order.getId(), clientUserId);

alien-lawyer/src/main/java/shop/alien/lawyer/service/impl/LawyerUserViolationServiceImpl.java

@@ -26,6 +26,7 @@ import shop.alien.lawyer.service.LawyerUserService;
 import shop.alien.lawyer.util.ali.AliApi;
 import shop.alien.util.common.EnumUtil;
 import shop.alien.util.common.constant.LawyerStatusEnum;
+import shop.alien.util.type.LifeNoticeUtil;
 
 import java.io.IOException;
 import java.math.BigDecimal;
@@ -119,6 +120,8 @@ public class LawyerUserViolationServiceImpl extends ServiceImpl<LawyerUserViolat
 
     private final LifeNoticeMapper lifeNoticeMapper;
 
+    private final LifeNoticeUtil lifeNoticeUtil;
+
     private final WebSocketProcess webSocketProcess;
 
     private final StoreDictionaryMapper storeDictionaryMapper;
@@ -301,6 +304,7 @@ public class LawyerUserViolationServiceImpl extends ServiceImpl<LawyerUserViolat
                 return;
             }
 
+            lifeNoticeUtil.fillUserTypeAndRefId(lifeNotice);
             int noticeResult = lifeNoticeMapper.insert(lifeNotice);
             if (noticeResult <= 0) {
                 log.warn("保存举报人通知失败，举报ID：{}", lawyerUserViolation.getId());
@@ -333,6 +337,7 @@ public class LawyerUserViolationServiceImpl extends ServiceImpl<LawyerUserViolat
                 return;
             }
 
+            lifeNoticeUtil.fillUserTypeAndRefId(lifeNoticeReported);
             int noticeResult = lifeNoticeMapper.insert(lifeNoticeReported);
             if (noticeResult <= 0) {
                 log.warn("保存被举报人通知失败，举报ID：{}", lawyerUserViolation.getId());
@@ -1239,6 +1244,7 @@ public class LawyerUserViolationServiceImpl extends ServiceImpl<LawyerUserViolat
             // 创建并保存通知
             LifeNotice lifeNotice = createLifeNotice(violation.getId(), receiverId,
                     notificationInfo.getTitle(), notificationInfo.getMessage());
+            lifeNoticeUtil.fillUserTypeAndRefId(lifeNotice);
             lifeNoticeMapper.insert(lifeNotice);
 
             // 发送WebSocket消息
@@ -1251,6 +1257,7 @@ public class LawyerUserViolationServiceImpl extends ServiceImpl<LawyerUserViolat
             String notificationInfo1 = "您的编号为" + violation.getOrderNumber() + "的订单，订单金额已原路返还至您的支付渠道，请查收";
             LifeNotice lifeNotice1 = createLifeNotice(violation.getId(), receiverId,
                     "退款到账通知", notificationInfo1);
+            lifeNoticeUtil.fillUserTypeAndRefId(lifeNotice1);
             lifeNoticeMapper.insert(lifeNotice1);
 
             // 发送WebSocket消息
@@ -1284,6 +1291,7 @@ public class LawyerUserViolationServiceImpl extends ServiceImpl<LawyerUserViolat
             // 创建并保存通知
             LifeNotice lifeNotice = createLifeNotice(violation.getId(), receiverId,
                     notificationInfo.getTitle(), notificationInfo.getMessage());
+            lifeNoticeUtil.fillUserTypeAndRefId(lifeNotice);
             lifeNoticeMapper.insert(lifeNotice);
 
             // 发送WebSocket消息

alien-lawyer/src/main/java/shop/alien/lawyer/service/impl/OrderExpirationServiceImpl.java

@@ -21,6 +21,7 @@ import shop.alien.lawyer.listener.RedisKeyExpirationHandler;
 import shop.alien.lawyer.service.OrderExpirationService;
 import shop.alien.mapper.LawyerConsultationOrderMapper;
 import shop.alien.mapper.LifeNoticeMapper;
+import shop.alien.util.type.LifeNoticeUtil;
 import shop.alien.mapper.LifeUserMapper;
 import shop.alien.util.common.DateUtils;
 import shop.alien.util.common.constant.PaymentEnum;
@@ -55,6 +56,8 @@ public class OrderExpirationServiceImpl implements OrderExpirationService, Comma
     private final LawyerConsultationOrderMapper orderMapper;
     private final AliController aliController;
     private final LifeNoticeMapper lifeNoticeMapper;
+
+    private final LifeNoticeUtil lifeNoticeUtil;
     private final LifeUserMapper lifeUserMapper;
     private final WebSocketProcess webSocketProcess;
     private final AlienStoreFeign alienStoreFeign;
@@ -167,6 +170,7 @@ public class OrderExpirationServiceImpl implements OrderExpirationService, Comma
                 LifeNotice lifeNotice = buildUserLifeNotice(order, title, message);
                 WebSocketVo webSocketVo = buildWebSocketVo(lifeNotice);
 
+                lifeNoticeUtil.fillUserTypeAndRefId(lifeNotice);
                 lifeNoticeMapper.insert(lifeNotice);
                 webSocketProcess.sendMessage(lifeNotice.getReceiverId(), JSONObject.from(webSocketVo).toJSONString());
 
@@ -188,6 +192,7 @@ public class OrderExpirationServiceImpl implements OrderExpirationService, Comma
                     WebSocketVo webSocketVo2 = buildWebSocketVo(lifeNotice2);
                     lifeNotice2.setCreatedTime(DateUtils.calcMinute(new Date(), 2));
 
+                    lifeNoticeUtil.fillUserTypeAndRefId(lifeNotice2);
                     lifeNoticeMapper.insert(lifeNotice2);
                     webSocketProcess.sendMessage(lifeNotice2.getReceiverId(), JSONObject.from(webSocketVo2).toJSONString());
 
@@ -216,6 +221,7 @@ public class OrderExpirationServiceImpl implements OrderExpirationService, Comma
                 LifeNotice lifeNotice = buildUserLifeNotice(order, "同意退款通知", "您的编号为" + orderNo + "的订单，律师已同意您的退款申请，订单金额将在1-3个工作日原路返还，请注意查收。");
                 WebSocketVo webSocketVo = buildWebSocketVo(lifeNotice);
 
+                lifeNoticeUtil.fillUserTypeAndRefId(lifeNotice);
                 lifeNoticeMapper.insert(lifeNotice);
                 webSocketProcess.sendMessage(lifeNotice.getReceiverId(), JSONObject.from(webSocketVo).toJSONString());
 
@@ -235,6 +241,7 @@ public class OrderExpirationServiceImpl implements OrderExpirationService, Comma
                     WebSocketVo webSocketVo2 = buildWebSocketVo(lifeNotice2);
                     lifeNotice2.setCreatedTime(DateUtils.calcMinute(lifeNotice2.getCreatedTime(), 2));
 
+                    lifeNoticeUtil.fillUserTypeAndRefId(lifeNotice2);
                     lifeNoticeMapper.insert(lifeNotice2);
                     webSocketProcess.sendMessage(lifeNotice2.getReceiverId(), JSONObject.from(webSocketVo2).toJSONString());
 

alien-lawyer/src/main/java/shop/alien/lawyer/service/impl/OrderReviewServiceImpl.java

@@ -26,6 +26,7 @@ import shop.alien.lawyer.config.WebSocketProcess;
 import shop.alien.lawyer.service.OrderReviewService;
 import shop.alien.lawyer.service.ReviewCommentService;
 import shop.alien.mapper.*;
+import shop.alien.util.type.LifeNoticeUtil;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -50,6 +51,8 @@ public class OrderReviewServiceImpl extends ServiceImpl<OrderReviewMapper, Order
     private final LifeLikeRecordMapper lifeLikeRecordMapper;
     private final LawyerUserMapper lawyerUserMapper;
     private final LifeNoticeMapper lifeNoticeMapper;
+
+    private final LifeNoticeUtil lifeNoticeUtil;
     private final WebSocketProcess webSocketProcess;
     private final LifeUserMapper lifeUserMapper;
 
@@ -778,6 +781,7 @@ public class OrderReviewServiceImpl extends ServiceImpl<OrderReviewMapper, Order
             LifeNotice lifeNotice = createBadReviewNotice(review.getId(), receiverId, orderNumber, message);
 
             // 保存通知
+            lifeNoticeUtil.fillUserTypeAndRefId(lifeNotice);
             int insertResult = lifeNoticeMapper.insert(lifeNotice);
             if (insertResult > 0) {
                 log.info("发送差评通知成功，评价ID={}，订单编号={}，接收人ID={}", 

alien-lawyer/src/main/java/shop/alien/lawyer/service/impl/StoreCommentServiceImpl.java

@@ -36,6 +36,7 @@ import shop.alien.util.common.netease.TextCheckUtil;
 import shop.alien.util.common.safe.TextModerationResultVO;
 import shop.alien.util.common.safe.TextModerationUtil;
 import shop.alien.util.common.safe.TextReviewServiceEnum;
+import shop.alien.util.type.LifeNoticeUtil;
 
 import java.io.IOException;
 import java.math.BigDecimal;
@@ -77,6 +78,8 @@ public class StoreCommentServiceImpl extends ServiceImpl<StoreCommentMapper, Sto
 
     private final LifeNoticeMapper lifeNoticeMapper;
 
+    private final LifeNoticeUtil lifeNoticeUtil;
+
     private final WebSocketProcess webSocketProcess;
 
     private final TagsSynonymMapper tagsSynonymMapper;
@@ -693,6 +696,7 @@ public class StoreCommentServiceImpl extends ServiceImpl<StoreCommentMapper, Sto
                 lifeMessage.setIsRead(0);
                 lifeMessage.setNoticeType(1);
                 lifeMessage.setBusinessType(1);
+                lifeNoticeUtil.fillUserTypeAndRefId(lifeMessage);
                 lifeNoticeMapper.insert(lifeMessage);
 
                 WebSocketVo websocketVo = new WebSocketVo();
@@ -841,6 +845,7 @@ public class StoreCommentServiceImpl extends ServiceImpl<StoreCommentMapper, Sto
                 lifeMessage.setIsRead(0);
                 lifeMessage.setNoticeType(1);
                 lifeMessage.setBusinessType(1);
+                lifeNoticeUtil.fillUserTypeAndRefId(lifeMessage);
                 lifeNoticeMapper.insert(lifeMessage);
 
                 WebSocketVo websocketVo = new WebSocketVo();

alien-second/src/main/java/shop/alien/second/service/impl/RiskControlServiceImpl.java

@@ -21,6 +21,7 @@ import shop.alien.entity.store.LifeUser;
 import shop.alien.entity.store.LifeNotice;
 import shop.alien.entity.store.vo.WebSocketVo;
 import shop.alien.mapper.LifeNoticeMapper;
+import shop.alien.util.type.LifeNoticeUtil;
 import shop.alien.mapper.LifeUserMapper;
 import shop.alien.mapper.second.SecondRiskControlRecordMapper;
 import shop.alien.mapper.second.SecondUserCreditMapper;
@@ -42,6 +43,8 @@ public class RiskControlServiceImpl extends ServiceImpl<SecondRiskControlRecordM
 
     private final SecondRiskControlRecordMapper secondRiskControlRecordMapper;
     private final LifeNoticeMapper lifeNoticeMapper;
+
+    private final LifeNoticeUtil lifeNoticeUtil;
     private final LifeUserMapper lifeUserMapper;
     private final AlienStoreFeign alienStoreFeign;
 
@@ -142,6 +145,7 @@ public class RiskControlServiceImpl extends ServiceImpl<SecondRiskControlRecordM
         JSONObject noticeMessage = new JSONObject();
         noticeMessage.put("message", "账号违反平台规约进行封禁处理");
         lifeNotice.setContext(noticeMessage.toJSONString());
+        lifeNoticeUtil.fillUserTypeAndRefId(lifeNotice);
         lifeNoticeMapper.insert(lifeNotice);
 
         // 给买家推送通知

alien-second/src/main/java/shop/alien/second/service/impl/SecondGoodsNotificationServiceImpl.java

@@ -9,6 +9,7 @@ import shop.alien.entity.store.LifeNotice;
 import shop.alien.entity.store.LifeUser;
 import shop.alien.entity.store.vo.WebSocketVo;
 import shop.alien.mapper.LifeNoticeMapper;
+import shop.alien.util.type.LifeNoticeUtil;
 import shop.alien.mapper.LifeUserMapper;
 import shop.alien.second.feign.AlienStoreFeign;
 import shop.alien.second.service.SecondGoodsNotificationService;
@@ -33,6 +34,8 @@ public class SecondGoodsNotificationServiceImpl implements SecondGoodsNotificati
      */
     private final LifeNoticeMapper lifeNoticeMapper;
 
+    private final LifeNoticeUtil lifeNoticeUtil;
+
     /**
      * 店铺服务Feign接口
      */
@@ -62,6 +65,7 @@ public class SecondGoodsNotificationServiceImpl implements SecondGoodsNotificati
         lifeNotice.setContext(jsonObject.toJSONString());
         lifeNotice.setNoticeType(Constants.Notice.SYSTEM_NOTICE); // 系统通知
         lifeNotice.setIsRead(0);
+        lifeNoticeUtil.fillUserTypeAndRefId(lifeNotice);
         lifeNoticeMapper.insert(lifeNotice);
         
         sendNotice("user_" + phone, lifeNotice);
@@ -91,6 +95,7 @@ public class SecondGoodsNotificationServiceImpl implements SecondGoodsNotificati
         lifeNotice.setContext(jsonObject.toJSONString());
         lifeNotice.setNoticeType(Constants.Notice.SYSTEM_NOTICE); // 系统通知
         lifeNotice.setIsRead(0);
+        lifeNoticeUtil.fillUserTypeAndRefId(lifeNotice);
         lifeNoticeMapper.insert(lifeNotice);
         
         sendNotice("user_" + phone, lifeNotice);
@@ -120,6 +125,7 @@ public class SecondGoodsNotificationServiceImpl implements SecondGoodsNotificati
             lifeNotice.setContext(jsonObject.toJSONString());
             lifeNotice.setNoticeType(Constants.Notice.SYSTEM_NOTICE); // 系统通知
             lifeNotice.setIsRead(0);
+            lifeNoticeUtil.fillUserTypeAndRefId(lifeNotice);
             lifeNoticeMapper.insert(lifeNotice);
             
             sendNotice("user_" + phone, lifeNotice);

alien-second/src/main/java/shop/alien/second/service/impl/SecondGoodsReportingServiceImpl.java

@@ -22,6 +22,7 @@ import shop.alien.second.util.AiUserViolationUtils;
 import shop.alien.second.util.JsonUtils;
 import shop.alien.util.common.Constants;
 import shop.alien.util.common.JwtUtil;
+import shop.alien.util.type.LifeNoticeUtil;
 
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
@@ -42,6 +43,8 @@ public class SecondGoodsReportingServiceImpl implements SecondGoodsReportingServ
     @Autowired
     private final LifeNoticeMapper lifeNoticeMapper;
 
+    private final LifeNoticeUtil lifeNoticeUtil;
+
     @Autowired
     private final LifeUserViolationMapper lifeUserViolationMapper;
 
@@ -247,6 +250,7 @@ public class SecondGoodsReportingServiceImpl implements SecondGoodsReportingServ
                     String phoneId = Objects.requireNonNull(JwtUtil.getCurrentUserInfo()).getString("userType") + "_" + JwtUtil.getCurrentUserInfo().getString("phone");
                     // 举报通知
                     LifeNotice lifeNotice = getLifeNotice(lifeuserViolation);
+                    lifeNoticeUtil.fillUserTypeAndRefId(lifeNotice);
                     lifeNoticeMapper.insert(lifeNotice);
 
                     // 保存图片

alien-second/src/main/java/shop/alien/second/service/impl/SecondGoodsServiceImpl.java

@@ -36,6 +36,7 @@ import shop.alien.second.util.SecondHandSearchAiUtils;
 import shop.alien.util.common.Constants;
 import shop.alien.util.common.VideoUtils;
 import shop.alien.util.common.safe.*;
+import shop.alien.util.type.LifeNoticeUtil;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
@@ -105,6 +106,8 @@ public class SecondGoodsServiceImpl extends ServiceImpl<SecondGoodsMapper, Secon
      */
     private final LifeNoticeMapper lifeNoticeMapper;
 
+    private final LifeNoticeUtil lifeNoticeUtil;
+
     /**
      * 店铺图片Mapper，用于操作图片信息表
      */
@@ -1273,6 +1276,7 @@ public class SecondGoodsServiceImpl extends ServiceImpl<SecondGoodsMapper, Secon
         lifeNotice.setContext(jsonObject.toJSONString());
         lifeNotice.setNoticeType(Constants.Notice.SYSTEM_NOTICE); // 系统通知
         lifeNotice.setIsRead(0);
+        lifeNoticeUtil.fillUserTypeAndRefId(lifeNotice);
         lifeNoticeMapper.insert(lifeNotice);
         sendNotice("user_"+ phone, lifeNotice);
     }
@@ -1320,6 +1324,7 @@ public class SecondGoodsServiceImpl extends ServiceImpl<SecondGoodsMapper, Secon
         lifeNotice.setContext(jsonObject.toJSONString());
         lifeNotice.setNoticeType(Constants.Notice.SYSTEM_NOTICE); // 系统通知
         lifeNotice.setIsRead(0);
+        lifeNoticeUtil.fillUserTypeAndRefId(lifeNotice);
         lifeNoticeMapper.insert(lifeNotice);
         sendNotice("user_"+ phone, lifeNotice);
     }
@@ -2299,6 +2304,7 @@ public class SecondGoodsServiceImpl extends ServiceImpl<SecondGoodsMapper, Secon
             lifeNotice.setContext(jsonObject.toJSONString());
             lifeNotice.setNoticeType(Constants.Notice.SYSTEM_NOTICE); // 系统通知
             lifeNotice.setIsRead(0);
+            lifeNoticeUtil.fillUserTypeAndRefId(lifeNotice);
             lifeNoticeMapper.insert(lifeNotice);
             sendShelveNotice("user_"+ phone, lifeNotice);
         } catch (Exception e) {

alien-second/src/main/java/shop/alien/second/service/impl/SecondTradeRecordServiceImpl.java

@@ -30,6 +30,7 @@ import shop.alien.entity.second.vo.SellerEvaluationVo;
 import shop.alien.entity.store.vo.WebSocketVo;
 import shop.alien.mapper.LifeMessageMapper;
 import shop.alien.mapper.LifeNoticeMapper;
+import shop.alien.util.type.LifeNoticeUtil;
 import shop.alien.mapper.LifeUserMapper;
 import shop.alien.mapper.StoreDictionaryMapper;
 import shop.alien.mapper.second.*;
@@ -64,6 +65,8 @@ public class SecondTradeRecordServiceImpl extends ServiceImpl<SecondTradeRecordM
     private final SecondUserCreditRecordMapper secondUserCreditRecordMapper;
     private final LifeMessageMapper lifeMessageMapper;
     private final LifeNoticeMapper lifeNoticeMapper;
+
+    private final LifeNoticeUtil lifeNoticeUtil;
     private final LifeUserMapper lifeUserMapper;
     private final AlienStoreFeign alienStoreFeign;
     private final StoreDictionaryMapper storeDictionaryMapper;
@@ -843,6 +846,7 @@ public class SecondTradeRecordServiceImpl extends ServiceImpl<SecondTradeRecordM
             noticeMessage.put("otherSideImage", null == seller ? "" : seller.getUserImage());
             noticeMessage.put("message", "您有一笔交易即将开始, 请及时前往查看");
             lifeNotice.setContext(noticeMessage.toJSONString());
+            lifeNoticeUtil.fillUserTypeAndRefId(lifeNotice);
             lifeNoticeMapper.insert(lifeNotice);
 
             // 给买家推送通知
@@ -890,6 +894,7 @@ public class SecondTradeRecordServiceImpl extends ServiceImpl<SecondTradeRecordM
             noticeMessage.put("otherSideImage", null == buyer ? "" : buyer.getUserImage());
             noticeMessage.put("message", "您有一笔交易即将开始, 请及时前往查看");
             lifeNotice.setContext(noticeMessage.toJSONString());
+            lifeNoticeUtil.fillUserTypeAndRefId(lifeNotice);
             lifeNoticeMapper.insert(lifeNotice);
 
             // 给卖家推送通知

alien-second/src/main/java/shop/alien/second/task/Task.java

@@ -19,6 +19,7 @@ import shop.alien.entity.store.LifeUser;
 import shop.alien.entity.store.vo.WebSocketVo;
 import shop.alien.mapper.LifeMessageMapper;
 import shop.alien.mapper.LifeNoticeMapper;
+import shop.alien.util.type.LifeNoticeUtil;
 import shop.alien.mapper.LifeUserMapper;
 import shop.alien.mapper.second.SecondGoodsMapper;
 import shop.alien.mapper.second.SecondTradeOperationMapper;
@@ -40,6 +41,8 @@ public class Task {
 
     private final LifeNoticeMapper lifeNoticeMapper;
 
+    private final LifeNoticeUtil lifeNoticeUtil;
+
     private final LifeUserMapper lifeUserMapper;
 
     private final LifeMessageMapper lifeMessageMapper;
@@ -125,6 +128,7 @@ public class Task {
                 noticeMessage.put("otherSideImage", null == seller ? "" : seller.getUserImage());
                 noticeMessage.put("message", "您有一笔交易即将开始, 请及时前往查看");
                 lifeNotice.setContext(noticeMessage.toJSONString());
+                lifeNoticeUtil.fillUserTypeAndRefId(lifeNotice);
                 lifeNoticeMapper.insert(lifeNotice);
 
                 // 给买家推送通知
@@ -172,6 +176,7 @@ public class Task {
                 noticeMessage.put("otherSideImage", null == buyer ? "" : buyer.getUserImage());
                 noticeMessage.put("message", "您有一笔交易即将开始, 请及时前往查看");
                 lifeNotice.setContext(noticeMessage.toJSONString());
+                lifeNoticeUtil.fillUserTypeAndRefId(lifeNotice);
                 lifeNoticeMapper.insert(lifeNotice);
 
                 // 给卖家推送通知
@@ -238,6 +243,7 @@ public class Task {
                 noticeMessage.put("tradeStatus", tradeRecord.getTradeStatus());
                 noticeMessage.put("message", "您有一笔交易已完成, 请前往确认");
                 lifeNotice.setContext(noticeMessage.toJSONString());
+                lifeNoticeUtil.fillUserTypeAndRefId(lifeNotice);
                 lifeNoticeMapper.insert(lifeNotice);
 
                 // 给买家推送通知
@@ -259,6 +265,7 @@ public class Task {
                 lifeNotice.setTitle("商品是否交易成功");
                 lifeNotice.setNoticeType(1);
                 lifeNotice.setContext(noticeMessage.toJSONString());
+                lifeNoticeUtil.fillUserTypeAndRefId(lifeNotice);
                 lifeNoticeMapper.insert(lifeNotice);
 
                 // 给卖家推送通知

alien-store-platform/src/main/java/shop/alien/storeplatform/service/impl/OperationalActivityServiceImpl.java

@@ -29,6 +29,7 @@ import shop.alien.entity.storePlatform.vo.StoreOperationalActivityVO;
 import shop.alien.mapper.LifeCouponMapper;
 import shop.alien.mapper.LifeDiscountCouponMapper;
 import shop.alien.mapper.LifeNoticeMapper;
+import shop.alien.util.type.LifeNoticeUtil;
 import shop.alien.mapper.StoreImgMapper;
 import shop.alien.mapper.StoreUserMapper;
 import shop.alien.mapper.storePlantform.StoreOperationalActivityMapper;
@@ -79,6 +80,8 @@ public class OperationalActivityServiceImpl implements OperationalActivityServic
 
     private final LifeNoticeMapper lifeNoticeMapper;
 
+    private final LifeNoticeUtil lifeNoticeUtil;
+
     private final AlienAIFeign alienAIFeign;
 
     private final AlienStoreFeign alienStoreFeign;
@@ -673,6 +676,7 @@ public class OperationalActivityServiceImpl implements OperationalActivityServic
         lifeNotice.setIsRead(0);
 
         // 保存通知到数据库
+        lifeNoticeUtil.fillUserTypeAndRefId(lifeNotice);
         lifeNoticeMapper.insert(lifeNotice);
 
         // 通过WebSocket发送实时通知

alien-store-platform/src/main/java/shop/alien/storeplatform/service/impl/OperationalActivitySignupServiceImpl.java

@@ -17,6 +17,7 @@ import shop.alien.entity.storePlatform.StoreOperationalActivity;
 import shop.alien.entity.storePlatform.StoreOperationalActivitySignup;
 import shop.alien.entity.storePlatform.vo.StoreOperationalActivitySignupVO;
 import shop.alien.mapper.LifeNoticeMapper;
+import shop.alien.util.type.LifeNoticeUtil;
 import shop.alien.mapper.LifeUserMapper;
 import shop.alien.mapper.storePlantform.StoreOperationalActivityMapper;
 import shop.alien.mapper.storePlantform.StoreOperationalActivitySignupMapper;
@@ -43,6 +44,8 @@ public class OperationalActivitySignupServiceImpl implements OperationalActivity
     private final StoreOperationalActivityMapper activityMapper;
     private final LifeUserMapper lifeUserMapper;
     private final LifeNoticeMapper lifeNoticeMapper;
+
+    private final LifeNoticeUtil lifeNoticeUtil;
     private final AlienStoreFeign alienStoreFeign;
 
     @Override
@@ -398,6 +401,7 @@ public class OperationalActivitySignupServiceImpl implements OperationalActivity
         lifeNotice.setIsRead(0);
 
         // 保存通知到数据库
+        lifeNoticeUtil.fillUserTypeAndRefId(lifeNotice);
         lifeNoticeMapper.insert(lifeNotice);
 
         // 通过WebSocket发送实时通知

alien-store-platform/src/main/java/shop/alien/storeplatform/service/impl/StoreBusinessServiceImpl.java

@@ -44,6 +44,7 @@ import shop.alien.util.common.DistanceUtil;
 import shop.alien.util.common.constant.CouponStatusEnum;
 import shop.alien.util.common.constant.CouponTypeEnum;
 import shop.alien.util.common.constant.OrderStatusEnum;
+import shop.alien.util.type.LifeNoticeUtil;
 
 import javax.annotation.Resource;
 import java.io.File;
@@ -122,6 +123,8 @@ public class StoreBusinessServiceImpl extends ServiceImpl<StoreInfoMapper, Store
 
     private final LifeNoticeMapper lifeNoticeMapper;
 
+    private final LifeNoticeUtil lifeNoticeUtil;
+
     private final LifeGroupBuyMainMapper lifeGroupBuyMainMapper;
 
 
@@ -747,6 +750,7 @@ public class StoreBusinessServiceImpl extends ServiceImpl<StoreInfoMapper, Store
         lifeMessage.setSenderId("system");
         lifeMessage.setIsRead(0);
         lifeMessage.setNoticeType(1);
+        lifeNoticeUtil.fillUserTypeAndRefId(lifeMessage);
         lifeNoticeMapper.insert(lifeMessage);
 
         WebSocketVo websocketVo = new WebSocketVo();
@@ -1378,6 +1382,7 @@ public class StoreBusinessServiceImpl extends ServiceImpl<StoreInfoMapper, Store
         lifeNotice.setContext(jsonObject.toJSONString());
         lifeNotice.setNoticeType(1); // 系统通知
         lifeNotice.setIsRead(0);
+        lifeNoticeUtil.fillUserTypeAndRefId(lifeNotice);
         lifeNoticeMapper.insert(lifeNotice);
 
         WebSocketVo websocketVo = new WebSocketVo();
@@ -1887,6 +1892,7 @@ public class StoreBusinessServiceImpl extends ServiceImpl<StoreInfoMapper, Store
             if (num > 0) {
                 // 发送通知
                 LifeNotice lifeMessage = getLifeNotice(storeInfo);
+                lifeNoticeUtil.fillUserTypeAndRefId(lifeMessage);
                 lifeNoticeMapper.insert(lifeMessage);
                 WebSocketVo websocketVo = new WebSocketVo();
                 websocketVo.setSenderId("system");
@@ -1944,6 +1950,7 @@ public class StoreBusinessServiceImpl extends ServiceImpl<StoreInfoMapper, Store
             lifeMessage.setSenderId("system");
             lifeMessage.setIsRead(0);
             lifeMessage.setNoticeType(1);
+            lifeNoticeUtil.fillUserTypeAndRefId(lifeMessage);
             lifeNoticeMapper.insert(lifeMessage);
 
             WebSocketVo websocketVo = new WebSocketVo();

alien-store-platform/src/main/java/shop/alien/storeplatform/service/impl/StoreManageServiceImpl.java

@@ -22,6 +22,7 @@ import shop.alien.storeplatform.util.LoginUserUtil;
 import shop.alien.storeplatform.util.NearMeUtil;
 import shop.alien.util.common.constant.OrderStatusEnum;
 import shop.alien.util.map.DistanceUtil;
+import shop.alien.util.type.LifeNoticeUtil;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
@@ -54,6 +55,8 @@ public class StoreManageServiceImpl implements StoreManageService {
     private final TagStoreRelationMapper tagStoreRelationMapper;
     
     private final LifeNoticeMapper lifeNoticeMapper;
+
+    private final LifeNoticeUtil lifeNoticeUtil;
     
     private final StoreInfoDraftMapper storeInfoDraftMapper;
     
@@ -397,6 +400,7 @@ public class StoreManageServiceImpl implements StoreManageService {
             lifeNotice.setSenderId("system");
             lifeNotice.setIsRead(0);
             lifeNotice.setNoticeType(1);
+            lifeNoticeUtil.fillUserTypeAndRefId(lifeNotice);
             lifeNoticeMapper.insert(lifeNotice);
             
             // 2. 通过 WebSocket 实时推送消息

alien-store/src/main/java/shop/alien/store/controller/LifeNoticeController.java

@@ -11,7 +11,7 @@ import shop.alien.entity.store.LifeNotice;
 import shop.alien.entity.store.vo.LifeNoticeVo;
 import shop.alien.mapper.LifeNoticeMapper;
 import shop.alien.store.service.LifeNoticeService;
-import shop.alien.store.util.LifeNoticeUtil;
+import shop.alien.util.type.LifeNoticeUtil;
 
 import java.util.List;
 

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

@@ -25,8 +25,7 @@ import shop.alien.mapper.LifeAppealManageMapper;
 import shop.alien.mapper.LifeNoticeMapper;
 import shop.alien.mapper.StoreCommentAppealMapper;
 import shop.alien.mapper.StoreCommentMapper;
-import shop.alien.store.util.LifeNoticeUtil;
-import shop.alien.store.util.LifeNoticeUtil;
+import shop.alien.util.type.LifeNoticeUtil;
 import shop.alien.util.ali.AliOSSUtil;
 
 import java.io.File;

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

@@ -21,7 +21,7 @@ import shop.alien.mapper.*;
 import shop.alien.mapper.second.SecondGoodsMapper;
 import shop.alien.store.service.clockin.ClockInRecommendCacheService;
 import shop.alien.store.service.dynamics.DynamicsRecommendCacheService;
-import shop.alien.store.util.LifeNoticeUtil;
+import shop.alien.util.type.LifeNoticeUtil;
 import shop.alien.util.type.PhoneTypeIdResult;
 import shop.alien.util.type.TypeUtil;
 

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

@@ -31,7 +31,7 @@ import shop.alien.store.util.ali.AliApi;
 import shop.alien.util.ali.AliOSSUtil;
 import shop.alien.util.common.UniqueRandomNumGenerator;
 import shop.alien.util.common.constant.*;
-import shop.alien.store.util.LifeNoticeUtil;
+import shop.alien.util.type.LifeNoticeUtil;
 
 import java.io.File;
 import java.io.IOException;

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

@@ -40,7 +40,7 @@ import shop.alien.store.service.clockin.ClockInRecommendCacheService;
 import shop.alien.store.service.dynamics.DynamicsRecommendCacheService;
 import shop.alien.store.util.FunctionMagic;
 import shop.alien.store.util.LifeFansIdentityQuery;
-import shop.alien.store.util.LifeNoticeUtil;
+import shop.alien.util.type.LifeNoticeUtil;
 import shop.alien.util.type.PhoneTypeIdResult;
 import shop.alien.util.type.TypeUtil;
 

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

@@ -20,7 +20,7 @@ import org.springframework.web.client.RestTemplate;
 import shop.alien.entity.result.R;
 import shop.alien.entity.store.*;
 import shop.alien.mapper.*;
-import shop.alien.store.util.LifeNoticeUtil;
+import shop.alien.util.type.LifeNoticeUtil;
 import shop.alien.util.common.constant.CommentSourceTypeEnum;
 
 import java.util.ArrayList;

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

@@ -8,7 +8,7 @@ import org.springframework.stereotype.Service;
 import shop.alien.entity.store.LifeNotice;
 import shop.alien.mapper.LifeNoticeMapper;
 import shop.alien.store.service.ArrivalReminderNoticeService;
-import shop.alien.store.util.LifeNoticeUtil;
+import shop.alien.util.type.LifeNoticeUtil;
 
 /**
  * 到店提醒用户站内通知：独立实现，便于维护与测试

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

@@ -22,7 +22,7 @@ import shop.alien.store.service.OrderReviewService;
 import shop.alien.store.service.ReviewCommentService;
 import shop.alien.util.common.JwtUtil;
 import shop.alien.util.common.ListToPage;
-import shop.alien.store.util.LifeNoticeUtil;
+import shop.alien.util.type.LifeNoticeUtil;
 
 import java.util.ArrayList;
 import java.util.Date;

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

@@ -44,7 +44,7 @@ import shop.alien.util.common.constant.CommentSourceTypeEnum;
 import shop.alien.util.common.constant.RatingBusinessTypeEnum;
 import shop.alien.util.common.safe.TextModerationUtil;
 import shop.alien.util.common.safe.TextReviewServiceEnum;
-import shop.alien.store.util.LifeNoticeUtil;
+import shop.alien.util.type.LifeNoticeUtil;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;

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

@@ -25,7 +25,7 @@ import shop.alien.store.service.LawyerUserViolationService;
 import shop.alien.store.util.ali.AliApi;
 import shop.alien.util.common.EnumUtil;
 import shop.alien.util.common.constant.LawyerStatusEnum;
-import shop.alien.store.util.LifeNoticeUtil;
+import shop.alien.util.type.LifeNoticeUtil;
 
 import java.io.IOException;
 import java.math.BigDecimal;

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

@@ -24,7 +24,7 @@ import shop.alien.store.service.LifeDiscountCouponStoreFriendService;
 import shop.alien.util.common.constant.DiscountCouponEnum;
 import shop.alien.util.coupon.DiscountCouponExpirationUtil;
 import shop.alien.util.coupon.LifeDiscountCouponStock;
-import shop.alien.store.util.LifeNoticeUtil;
+import shop.alien.util.type.LifeNoticeUtil;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;

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

@@ -22,7 +22,7 @@ import shop.alien.store.service.LifeFeedbackReplyService;
 import shop.alien.store.service.LifeFeedbackService;
 import shop.alien.store.service.LifeImgService;
 import shop.alien.store.util.ai.AiFeedbackAssignUtils;
-import shop.alien.store.util.LifeNoticeUtil;
+import shop.alien.util.type.LifeNoticeUtil;
 
 import java.util.ArrayList;
 import java.util.Date;

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

@@ -19,7 +19,7 @@ import shop.alien.store.util.GroupConstant;
 import shop.alien.util.common.UniqueRandomNumGenerator;
 import shop.alien.util.common.constant.DiscountCouponEnum;
 import shop.alien.util.coupon.DiscountCouponExpirationUtil;
-import shop.alien.store.util.LifeNoticeUtil;
+import shop.alien.util.type.LifeNoticeUtil;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;

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

@@ -15,7 +15,7 @@ import shop.alien.mapper.LifeNoticeMapper;
 import shop.alien.mapper.LifeUserExpertOrderMapper;
 import shop.alien.store.service.LifeUserExpertOrderService;
 import shop.alien.util.common.ListToPage;
-import shop.alien.store.util.LifeNoticeUtil;
+import shop.alien.util.type.LifeNoticeUtil;
 
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;

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

@@ -20,7 +20,7 @@ import shop.alien.mapper.LifeUserExpertOrderMapper;
 import shop.alien.mapper.LifeUserExpertWorksMapper;
 import shop.alien.store.service.LifeUserExpertOrderService;
 import shop.alien.store.service.LifeUserExpertService;
-import shop.alien.store.util.LifeNoticeUtil;
+import shop.alien.util.type.LifeNoticeUtil;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;

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

@@ -33,7 +33,7 @@ import shop.alien.store.util.FunctionMagic;
 import shop.alien.store.util.ai.AiReportReviewUtil;
 import shop.alien.util.ali.AliOSSUtil;
 import shop.alien.util.common.EnumUtil;
-import shop.alien.store.util.LifeNoticeUtil;
+import shop.alien.util.type.LifeNoticeUtil;
 
 import java.io.File;
 import java.io.IOException;

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

@@ -28,7 +28,7 @@ import shop.alien.mapper.storePlantform.StoreOperationalActivityMapper;
 import shop.alien.store.config.WebSocketProcess;
 import shop.alien.store.service.OperationalActivityService;
 import shop.alien.util.common.Constants;
-import shop.alien.store.util.LifeNoticeUtil;
+import shop.alien.util.type.LifeNoticeUtil;
 
 import java.util.*;
 

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

@@ -19,7 +19,7 @@ import shop.alien.mapper.UserReservationOrderMapper;
 import shop.alien.mapper.UserReservationTableMapper;
 import shop.alien.store.service.ReservationNoticeAsyncService;
 import shop.alien.store.service.StoreBookingTableService;
-import shop.alien.store.util.LifeNoticeUtil;
+import shop.alien.util.type.LifeNoticeUtil;
 
 import java.util.List;
 import java.util.stream.Collectors;

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

@@ -25,7 +25,7 @@ import shop.alien.store.config.WebSocketProcess;
 import shop.alien.store.service.CommonCommentService;
 import shop.alien.store.service.StoreClockInService;
 import shop.alien.store.service.StoreCommentService;
-import shop.alien.store.util.LifeNoticeUtil;
+import shop.alien.util.type.LifeNoticeUtil;
 import shop.alien.store.util.ai.AiContentModerationUtil;
 import shop.alien.util.common.constant.CommentSourceTypeEnum;
 import shop.alien.util.type.PhoneTypeIdResult;

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

@@ -44,7 +44,7 @@ import shop.alien.util.common.safe.TextModerationResultVO;
 import shop.alien.util.common.safe.TextModerationUtil;
 import shop.alien.util.common.safe.TextReviewServiceEnum;
 import shop.alien.util.common.constant.CommentSourceTypeEnum;
-import shop.alien.store.util.LifeNoticeUtil;
+import shop.alien.util.type.LifeNoticeUtil;
 
 import java.net.URLEncoder;
 import java.text.SimpleDateFormat;

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

@@ -31,7 +31,7 @@ import shop.alien.util.common.netease.TextCheckUtil;
 import shop.alien.util.common.safe.TextModerationResultVO;
 import shop.alien.util.common.safe.TextModerationUtil;
 import shop.alien.util.common.safe.TextReviewServiceEnum;
-import shop.alien.store.util.LifeNoticeUtil;
+import shop.alien.util.type.LifeNoticeUtil;
 
 import java.io.IOException;
 import java.math.BigDecimal;

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

@@ -26,7 +26,7 @@ import shop.alien.util.common.DateUtils;
 import shop.alien.util.common.ListToPage;
 import shop.alien.util.common.constant.CouponTypeEnum;
 import shop.alien.util.common.constant.OrderStatusEnum;
-import shop.alien.store.util.LifeNoticeUtil;
+import shop.alien.util.type.LifeNoticeUtil;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;

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

@@ -52,7 +52,7 @@ import shop.alien.util.common.constant.CouponStatusEnum;
 import shop.alien.util.common.constant.CouponTypeEnum;
 import shop.alien.util.common.constant.OcrTypeEnum;
 import shop.alien.util.common.constant.OrderStatusEnum;
-import shop.alien.store.util.LifeNoticeUtil;
+import shop.alien.util.type.LifeNoticeUtil;
 
 import javax.annotation.Resource;
 import java.io.File;

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

@@ -33,7 +33,7 @@ import shop.alien.store.config.WebSocketProcess;
 import shop.alien.store.dto.StoreOperationalActivitySignupDto;
 import shop.alien.store.service.StoreOperationalActivityService;
 import shop.alien.util.common.Constants;
-import shop.alien.store.util.LifeNoticeUtil;
+import shop.alien.util.type.LifeNoticeUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 
 import java.util.ArrayList;

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

@@ -20,7 +20,7 @@ import shop.alien.store.config.WebSocketProcess;
 import shop.alien.store.service.StoreRenovationRequirementService;
 import shop.alien.store.util.ai.AiContentModerationUtil;
 import shop.alien.util.common.JwtUtil;
-import shop.alien.store.util.LifeNoticeUtil;
+import shop.alien.util.type.LifeNoticeUtil;
 
 import java.text.SimpleDateFormat;
 import java.util.*;

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

@@ -36,7 +36,7 @@ import shop.alien.mapper.LifeNoticeMapper;
 import shop.alien.mapper.LifeUserMapper;
 import shop.alien.mapper.StoreUserMapper;
 import shop.alien.util.common.JwtUtil;
-import shop.alien.store.util.LifeNoticeUtil;
+import shop.alien.util.type.LifeNoticeUtil;
 import org.springframework.util.StringUtils;
 import javax.annotation.PostConstruct;
 import java.text.ParseException;

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

@@ -16,7 +16,7 @@ import shop.alien.mapper.LifeNoticeMapper;
 import shop.alien.mapper.LifeUserExpertMapper;
 import shop.alien.mapper.LifeUserMapper;
 import shop.alien.store.service.StoreUserExpertService;
-import shop.alien.store.util.LifeNoticeUtil;
+import shop.alien.util.type.LifeNoticeUtil;
 
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;

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

@@ -34,7 +34,7 @@ import shop.alien.store.util.FunctionMagic;
 import shop.alien.util.ali.AliOSSUtil;
 import shop.alien.util.common.DateUtils;
 import shop.alien.util.common.JwtUtil;
-import shop.alien.store.util.LifeNoticeUtil;
+import shop.alien.util.type.LifeNoticeUtil;
 
 import java.io.File;
 import java.io.IOException;

alien-store/src/main/java/shop/alien/store/util/ai/AiReportReviewUtil.java

@@ -17,7 +17,7 @@ import shop.alien.entity.store.*;
 import shop.alien.entity.store.vo.WebSocketVo;
 import shop.alien.mapper.*;
 import shop.alien.store.config.WebSocketProcess;
-import shop.alien.store.util.LifeNoticeUtil;
+import shop.alien.util.type.LifeNoticeUtil;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;