From 49e325f40f9721521de975fdd5f3d37f6fe78852 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期五, 24 十二月 2021 09:15:12 +0800
Subject: [PATCH] [fix] 調整簡訊標題，需中文10字以內並為base64編碼
---
pamapi/src/main/java/com/pollex/pam/service/mapper/ConsultantMapper.java | 50 ++++++++++++++++++--------------------------------
1 files changed, 18 insertions(+), 32 deletions(-)
diff --git a/pamapi/src/main/java/com/pollex/pam/service/mapper/ConsultantMapper.java b/pamapi/src/main/java/com/pollex/pam/service/mapper/ConsultantMapper.java
index 8a8d485..fd0ac35 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/mapper/ConsultantMapper.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/mapper/ConsultantMapper.java
@@ -1,14 +1,10 @@
package com.pollex.pam.service.mapper;
-import com.pollex.pam.domain.Appointment;
import com.pollex.pam.domain.Consultant;
-import com.pollex.pam.domain.CustomerFavoriteConsultant;
-import com.pollex.pam.enums.ContactStatusEnum;
-import com.pollex.pam.service.AppointmentService;
import com.pollex.pam.service.dto.ConsultantDTO;
import com.pollex.pam.service.dto.ConsultantDetailDTO;
+import com.pollex.pam.service.dto.CustomerFavoriteConsultantDTO;
import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.*;
@@ -19,8 +15,21 @@
private static final Character SPLIT_MASK = ',';
- @Autowired
- AppointmentService appointmentService;
+ public CustomerFavoriteConsultantDTO toCustomerFavoriteConsultantDto(Consultant source) {
+ CustomerFavoriteConsultantDTO consultantDTO = new CustomerFavoriteConsultantDTO();
+ consultantDTO.setAgentNo(source.getAgentNo());
+ consultantDTO.setName(source.getName());
+ consultantDTO.setAvgScore(source.getAvgScore());
+ consultantDTO.setSeniority(source.getSeniorityDTOString());
+ consultantDTO.setExpertise(splitStringWithChar(source.getExpertise()));
+ consultantDTO.setImg(source.getPhotoPath());
+ consultantDTO.setRole(source.getRole());
+
+ consultantDTO.setContactStatus(null);
+ consultantDTO.setUpdateTime(null);
+
+ return consultantDTO;
+ }
public ConsultantDTO toDto(Consultant source) {
ConsultantDTO consultantDTO = new ConsultantDTO();
@@ -39,29 +48,6 @@
return consultantDTO;
}
- public ConsultantDTO toDto(CustomerFavoriteConsultant customerFavoriteConsultant) {
- Consultant consultant = customerFavoriteConsultant.getConsultant();
- ConsultantDTO dto = toDto(consultant);
-
- final Optional<Appointment> latestAppointmentOptional = appointmentService.findByAgentNoAndCustomerId(consultant.getAgentNo(), customerFavoriteConsultant.getCustomerId())
- .stream()
- .max(Comparator.comparing(Appointment::getAppointmentDate));
-
- if(latestAppointmentOptional.isPresent()) {
- Appointment latestAppointment = latestAppointmentOptional.get();
- dto.setContactStatus(latestAppointment.getCommunicateStatus());
- dto.setLatestAppointmentId(latestAppointment.getId());
- dto.setUpdateTime(latestAppointment.getAppointmentDate());
- }
- else {
- dto.setContactStatus(ContactStatusEnum.PICKED);
- dto.setLatestAppointmentId(null);
- dto.setUpdateTime(customerFavoriteConsultant.getLastModifiedDate());
- }
-
- return dto;
- }
-
public ConsultantDetailDTO toDetailDto(Consultant source) {
ConsultantDetailDTO consultantDetailDTO = new ConsultantDetailDTO();
consultantDetailDTO.setName(source.getName());
@@ -75,8 +61,8 @@
consultantDetailDTO.setSeniority(source.getSeniorityDTOString());
consultantDetailDTO.setConcept(source.getConcept());
consultantDetailDTO.setAwards(source.getAward());
- consultantDetailDTO.setImage(source.getPhotoPath());
- consultantDetailDTO.setExpertises(splitStringWithChar(source.getExpertise()));
+ consultantDetailDTO.setImg(source.getPhotoPath());
+ consultantDetailDTO.setExpertise(splitStringWithChar(source.getExpertise()));
consultantDetailDTO.setExperiences(splitStringWithChar(source.getExperience()));
// todo 瘙箏����漲
--
Gitblit v1.8.0