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 |   25 ++++++++++++-------------
 1 files changed, 12 insertions(+), 13 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 fd0ac35..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
@@ -5,6 +5,7 @@
 import com.pollex.pam.service.dto.ConsultantDetailDTO;
 import com.pollex.pam.service.dto.CustomerFavoriteConsultantDTO;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
@@ -35,38 +36,36 @@
         ConsultantDTO consultantDTO = new ConsultantDTO();
         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);
-        consultantDTO.setLatestAppointmentId(null);
+        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.setImg(source.getPhotoPath());
         consultantDetailDTO.setExpertise(splitStringWithChar(source.getExpertise()));
-        consultantDetailDTO.setExperiences(splitStringWithChar(source.getExperience()));
+        consultantDetailDTO.setExperiences(source.getExperience());
 
-        // todo 瘙箏����漲
-        consultantDetailDTO.setSuitability(50);
+        // todo ��蝣箄�垣閰W漲銵函
         consultantDetailDTO.setEvaluation(50);
 
         return consultantDetailDTO;

--
Gitblit v1.8.0