From 07bac4d672fecac8fd3a316323482b4fcdc48f5d Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期二, 08 二月 2022 14:58:25 +0800
Subject: [PATCH] [update] 預約成功時，回給前端預約單的資訊
---
pamapi/src/main/java/com/pollex/pam/service/mapper/ConsultantMapper.java | 39 +++++++++++++++++++++++++--------------
1 files changed, 25 insertions(+), 14 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 e6dea8c..2406c7e 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,11 @@
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.beans.BeanUtils;
import org.springframework.stereotype.Service;
import java.util.*;
@@ -19,8 +16,8 @@
private static final Character SPLIT_MASK = ',';
- public ConsultantDTO toDto(Consultant source) {
- ConsultantDTO consultantDTO = new ConsultantDTO();
+ public CustomerFavoriteConsultantDTO toCustomerFavoriteConsultantDto(Consultant source) {
+ CustomerFavoriteConsultantDTO consultantDTO = new CustomerFavoriteConsultantDTO();
consultantDTO.setAgentNo(source.getAgentNo());
consultantDTO.setName(source.getName());
consultantDTO.setAvgScore(source.getAvgScore());
@@ -31,30 +28,44 @@
consultantDTO.setContactStatus(null);
consultantDTO.setUpdateTime(null);
- consultantDTO.setLatestAppointmentId(null);
+
+ return consultantDTO;
+ }
+
+ public ConsultantDTO toDto(Consultant source) {
+ ConsultantDTO consultantDTO = new ConsultantDTO();
+ consultantDTO.setAgentNo(source.getAgentNo());
+ consultantDTO.setName(source.getName());
+ consultantDTO.setRole(source.getRole());
+ consultantDTO.setAvgScore(source.getAvgScore());
+ consultantDTO.setServeArea(splitStringWithChar(source.getServeArea()));
+ consultantDTO.setSeniority_year(source.getSeniorityYear());
+ consultantDTO.setSeniority_month(source.getSeniorityMonth());
+ consultantDTO.setExpertise(splitStringWithChar(source.getExpertise()));
+ consultantDTO.setGender(source.getGender());
+ consultantDTO.setCommunicationStyle(source.getCommunicationStyle());
return consultantDTO;
}
public ConsultantDetailDTO toDetailDto(Consultant source) {
ConsultantDetailDTO consultantDetailDTO = new ConsultantDetailDTO();
+ BeanUtils.copyProperties(source, consultantDetailDTO);
consultantDetailDTO.setName(source.getName());
consultantDetailDTO.setAgentNo(source.getAgentNo());
consultantDetailDTO.setRole(source.getRole());
consultantDetailDTO.setAvgScore(source.getAvgScore());
consultantDetailDTO.setTitle(source.getTitle());
consultantDetailDTO.setPhoneNumber(source.getPhoneNumber());
- consultantDetailDTO.setServeArea(source.getServeArea());
+ consultantDetailDTO.setServeArea(splitStringWithChar(source.getServeArea()));
consultantDetailDTO.setCompanyAddress(source.getCompanyAddress());
consultantDetailDTO.setSeniority(source.getSeniorityDTOString());
consultantDetailDTO.setConcept(source.getConcept());
consultantDetailDTO.setAwards(source.getAward());
- consultantDetailDTO.setImage(source.getPhotoPath());
- consultantDetailDTO.setExpertises(splitStringWithChar(source.getExpertise()));
- consultantDetailDTO.setExperiences(splitStringWithChar(source.getExperience()));
+ consultantDetailDTO.setExpertise(splitStringWithChar(source.getExpertise()));
+ consultantDetailDTO.setExperiences(source.getExperience());
- // todo 瘙箏����漲
- consultantDetailDTO.setSuitability(50);
+ // todo ��蝣箄�垣閰Ｗ漲銵函
consultantDetailDTO.setEvaluation(50);
return consultantDetailDTO;
--
Gitblit v1.8.0