Merge branch 'Phase3' into pollex-dev

wayne

2022-02-17 34b08e1c461f5e08675fcff95525956d7c4bef11

 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.*;
@@ -18,6 +15,22 @@
public class ConsultantMapper {

    private static final Character SPLIT_MASK = ',';

    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();
@@ -29,15 +42,17 @@
        consultantDTO.setImg(source.getPhotoPath());
        consultantDTO.setRole(source.getRole());

        consultantDTO.setSuitability(0);
        consultantDTO.setContactStatus(null);
        consultantDTO.setUpdateTime(null);
        consultantDTO.setLatestAppointmentId(null);
//        consultantDTO.setLatestAppointmentId(null);

        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());
@@ -49,12 +64,11 @@
        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.setImg(source.getPhotoPath());
        consultantDetailDTO.setExpertise(splitStringWithChar(source.getExpertise()));
        consultantDetailDTO.setExperiences(source.getExperience());

        // todo 決定匹配程度
        consultantDetailDTO.setSuitability(50);
        // todo 需確認諮詢度表現
        consultantDetailDTO.setEvaluation(50);

        return consultantDetailDTO;