From 82a8bc62d5b9d5d607f6952329952b17eda2f0a0 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 14 九月 2026 15:44:34 +0800
Subject: [PATCH] update
---
backend/src/main/java/com/tourguide/modules/system/service/GuideNotificationService.java | 33 ++++++++++++++++++++-------------
1 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/backend/src/main/java/com/tourguide/modules/system/service/GuideNotificationService.java b/backend/src/main/java/com/tourguide/modules/system/service/GuideNotificationService.java
index 750d035..983bda7 100644
--- a/backend/src/main/java/com/tourguide/modules/system/service/GuideNotificationService.java
+++ b/backend/src/main/java/com/tourguide/modules/system/service/GuideNotificationService.java
@@ -38,7 +38,6 @@
public long unreadCount(Long guideId) {
List<SystemNotice> notices = publishedNotices();
- if (notices.isEmpty()) return 0L;
Set<Long> readIds = readNoticeIds(guideId, notices);
long systemUnread = notices.stream().filter(notice -> !readIds.contains(notice.getId())).count();
Long personalUnread = guideNotificationMapper.selectCount(new LambdaQueryWrapper<GuideNotification>()
@@ -86,12 +85,8 @@
public void notifyOrderAssigned(TourOrder order) {
if (order == null || order.getGuideId() == null) return;
- String title = "您有新的讲解订单";
- String content = "景区：" + valueOrUnknown(order.getScenicName())
- + "；汇合点：" + valueOrUnknown(order.getMeetingPointName())
- + "；服务类型：" + valueOrUnknown(order.getPackageName(), order.getOrderType())
- + "；人数：" + (order.getPeopleCount() == null ? 0 : order.getPeopleCount())
- + "。请及时接单。";
+ String title = "接单提醒";
+ String content = "您有一个新的讲解订单，请查看";
String targetUrl = orderTargetUrl(order.getId());
create(order.getGuideId(), "ORDER_ASSIGNED", title, content, order.getId(), targetUrl);
pushDeviceService.push(order.getGuideId(), title, content, targetUrl);
@@ -99,8 +94,8 @@
public void notifyVisitorCancelledOrder(TourOrder order) {
if (order == null || order.getGuideId() == null) return;
- String title = "订单已取消";
- String content = "游客已取消订单，该订单无需再前往服务。";
+ String title = "取消提醒";
+ String content = "您有一个讲解订单被取消，请查看";
String targetUrl = orderTargetUrl(order.getId());
create(order.getGuideId(), "ORDER_CANCELLED", title, content, order.getId(), targetUrl);
pushDeviceService.push(order.getGuideId(), title, content, targetUrl);
@@ -108,8 +103,20 @@
public void notifyOrderCancelled(TourOrder order) {
if (order == null || order.getGuideId() == null) return;
- create(order.getGuideId(), "ORDER_CANCELLED", "取消提醒", "您有一个被取消的讲解订单，请查看",
- order.getId(), orderTargetUrl(order.getId()));
+ String title = "取消提醒";
+ String content = "您有一个讲解订单被取消，请查看";
+ String targetUrl = orderTargetUrl(order.getId());
+ create(order.getGuideId(), "ORDER_CANCELLED", title, content, order.getId(), targetUrl);
+ pushDeviceService.push(order.getGuideId(), title, content, targetUrl);
+ }
+
+ public void notifyOrderReviewed(TourOrder order) {
+ if (order == null || order.getGuideId() == null) return;
+ String title = "评价提醒";
+ String content = "您有一条新的订单评价，请查看";
+ String targetUrl = "/pages/rating/index";
+ create(order.getGuideId(), "ORDER_REVIEWED", title, content, order.getId(), targetUrl);
+ pushDeviceService.push(order.getGuideId(), title, content, targetUrl);
}
public boolean pushServiceReminder(TourOrder order) {
@@ -121,8 +128,8 @@
}
public void notifyAuditResult(Long guideId, boolean approved) {
- create(guideId, approved ? "AUDIT_APPROVED" : "AUDIT_REJECTED", "【名导精讲】",
- approved ? "您的资料审核已通过，请前往应用查看。" : "您的资料审核未通过，请前往应用更新提交。",
+ create(guideId, approved ? "AUDIT_APPROVED" : "AUDIT_REJECTED", "系统提醒",
+ approved ? "您的资料审核已通过" : "您的资料审核未通过",
null, null);
}
--
Gitblit v1.7.1