From 4394e4248455637ab7836756058ac872fdf4af10 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期四, 17 二月 2022 11:39:43 +0800
Subject: [PATCH] Merge branch 'pollex-dev' into sit
---
pamapi/src/main/java/com/pollex/pam/service/PersonalNotificationService.java | 49 +++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 43 insertions(+), 6 deletions(-)
diff --git a/pamapi/src/main/java/com/pollex/pam/service/PersonalNotificationService.java b/pamapi/src/main/java/com/pollex/pam/service/PersonalNotificationService.java
index b6426cd..3fa7b67 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/PersonalNotificationService.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/PersonalNotificationService.java
@@ -1,10 +1,14 @@
package com.pollex.pam.service;
+import java.time.Instant;
import java.util.List;
+
+import javax.management.Notification;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
import com.pollex.pam.domain.Appointment;
import com.pollex.pam.domain.Consultant;
@@ -15,27 +19,28 @@
import com.pollex.pam.enums.PersonalNotificationRoleEnum;
import com.pollex.pam.repository.CustomerRepository;
import com.pollex.pam.repository.PersonalNotificationRepository;
+import com.pollex.pam.security.SecurityUtils;
import com.pollex.pam.service.dto.AppointmentUpdateDTO;
@Service
@Transactional
public class PersonalNotificationService {
-
+
@Autowired
PersonalNotificationRepository personalNotificationRepository;
-
+
@Autowired
ConsultantService consultantService;
-
+
@Autowired
AppointmentService appointmentService;
-
+
@Autowired
CustomerService customerService;
-
+
@Autowired
CustomerRepository customerRepository;
-
+
@Autowired
SatisfactionService satisfactionService;
@@ -67,6 +72,18 @@
entity.setTitle("憿批��赤�");
personalNotificationRepository.save(entity);
}
+
+ public void createNotFillAppointmentSatisfactionNumberToCustomer(Long customerId, int notFillSatisfactionSum) {
+ PersonalNotification entity = new PersonalNotification();
+
+ String content = "���� "+notFillSatisfactionSum+" 蝑“���遛��漲��閬‵撖�";
+ entity.setContent(content);
+ entity.setNotificationType(NotificationTypeEnum.ACTIVITY);
+ entity.setOwnerId(customerId);
+ entity.setOwnerRole(PersonalNotificationRoleEnum.CUSTOMER);
+ entity.setTitle("摰Ｘ皛踵�漲");
+ personalNotificationRepository.save(entity);
+ }
public void createEditConsultantToConsultant(Consultant consultant) {
PersonalNotification entity = new PersonalNotification();
@@ -119,4 +136,24 @@
personalNotificationRepository.save(entity);
}
+ public void readAllMyNotification() {
+ if(StringUtils.hasText(SecurityUtils.getAgentNo())) {
+ Long consultantId = consultantService.findByAgentNo(SecurityUtils.getAgentNo()).getId();
+ readAllNotification(PersonalNotificationRoleEnum.CONSULTANT, consultantId);
+ }else if(SecurityUtils.getCustomerDBId()!=null){
+ readAllNotification(PersonalNotificationRoleEnum.CUSTOMER, SecurityUtils.getCustomerDBId());
+ }
+ }
+
+ public void readAllNotification(PersonalNotificationRoleEnum ownerRole
+ , Long ownerId) {
+ List<PersonalNotification> allNotification = personalNotificationRepository.findAllByOwnerRoleAndOwnerId(ownerRole, ownerId);
+ Instant today = Instant.now();
+ allNotification.stream()
+ .filter(notification -> notification.getReadDate()==null)
+ .forEach(notification ->{
+ notification.setReadDate(today);
+ personalNotificationRepository.saveAll(allNotification);
+ });
+ }
}
--
Gitblit v1.8.0