七月迭代短暂完结,还有很多后端的关键东西没有弄,这是一版赶时间做的东西

internal/query/notification/query.go

@@ -115,6 +115,9 @@ func (q *Query) PersonalList(ctx context.Context, customerID uint, request dto.P
 		return nil, err
 	}
 	base := personalNotificationScope(q.db.WithContext(ctx).Model(&model.Notification{}), customerID, q.now().UTC())
+	if request.IsRead != nil {
+		base = base.Where("is_read = ?", *request.IsRead)
+	}
 	var total int64
 	if err := base.Count(&total).Error; err != nil {
 		return nil, errors.Wrap(errors.CodeDatabaseError, err, "查询个人客户通知总数失败")
@@ -194,8 +197,8 @@ func personalNotificationScope(db *gorm.DB, customerID uint, now time.Time) *gor
 		AND category IN ? AND type IN ? AND (expires_at IS NULL OR expires_at > ?)`,
 		constants.NotificationRecipientKindPersonalCustomer,
 		customerID,
-		[]string{constants.NotificationCategoryApproval, constants.NotificationCategoryExpiry},
-		[]string{constants.NotificationTypePackageExpiring},
+		[]string{constants.NotificationCategoryApproval, constants.NotificationCategoryExpiry, constants.NotificationCategorySystem},
+		[]string{constants.NotificationTypePackageExpiring, constants.NotificationTypeExchangeShippingCreated},
 		now,
 	)
 }