From c36029f188af2ff37cc2c5bbb846a2d8f26d3ae6 Mon Sep 17 00:00:00 2001 From: "feng.li" Date: Thu, 4 Jan 2024 17:52:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E9=94=80=E9=9D=A2=E8=AF=95=E7=BA=BF?= =?UTF-8?q?=E7=B4=A2=E7=9A=84=E6=84=8F=E5=90=91=E7=94=B3=E8=AF=B7=E9=80=9A?= =?UTF-8?q?=E8=BF=87=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/dao/HyPartnerExhibitionDAO.java | 8 ++++++ .../mapper/HyPartnerExhibitionMapper.java | 6 ++++ .../mapper/HyPartnerExhibitionMapper.xml | 14 ++++++++++ .../ExhibitionInterviewInfoDTO.java | 28 +++++++++++++++++++ .../impl/HyPartnerLineInfoServiceImpl.java | 9 ++++++ 5 files changed, 65 insertions(+) create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/dto/exhibition/ExhibitionInterviewInfoDTO.java diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerExhibitionDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerExhibitionDAO.java index caf6b4ea2..5f3dde2a6 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerExhibitionDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerExhibitionDAO.java @@ -1,5 +1,6 @@ package com.cool.store.dao; +import com.cool.store.dto.exhibition.ExhibitionInterviewInfoDTO; import com.cool.store.dto.exhibition.ExhibitionLineBaseDTO; import com.cool.store.dto.exhibition.ExhibitionLineDTO; import com.cool.store.dto.exhibition.PartnerSignUpDTO; @@ -177,4 +178,11 @@ public class HyPartnerExhibitionDAO { } hyPartnerExhibitionMapper.updateStatusAfterSubmitQualification(Long.parseLong(interviewPlanId)); } + + public ExhibitionInterviewInfoDTO getStartInterviewInfo(Long lineId) { + if (lineId == null) { + return null; + } + return hyPartnerExhibitionMapper.getStartInterviewInfo(lineId); + } } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerExhibitionMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerExhibitionMapper.java index c95052c9d..85ac397b2 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerExhibitionMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerExhibitionMapper.java @@ -1,5 +1,6 @@ package com.cool.store.mapper; +import com.cool.store.dto.exhibition.ExhibitionInterviewInfoDTO; import com.cool.store.dto.exhibition.ExhibitionLineBaseDTO; import com.cool.store.dto.exhibition.ExhibitionLineDTO; import com.cool.store.dto.exhibition.PartnerSignUpDTO; @@ -136,4 +137,9 @@ public interface HyPartnerExhibitionMapper { * @return */ int updateStatusAfterSubmitQualification(@Param("interviewPlanId") Long interviewPlanId); + + /** + * 获取部分会销面试发起人信息 + */ + ExhibitionInterviewInfoDTO getStartInterviewInfo(@Param("lineId") Long lineId); } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerExhibitionMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerExhibitionMapper.xml index 1c31e27eb..f36bccfa5 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerExhibitionMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerExhibitionMapper.xml @@ -530,4 +530,18 @@ AND interview_plan_id = #{interviewPlanId} + + \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/exhibition/ExhibitionInterviewInfoDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/exhibition/ExhibitionInterviewInfoDTO.java new file mode 100644 index 000000000..b98f38f1e --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/exhibition/ExhibitionInterviewInfoDTO.java @@ -0,0 +1,28 @@ +package com.cool.store.dto.exhibition; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Fun Li 2024/1/4 17:09 + * @version 1.0 + */ +@Data +public class ExhibitionInterviewInfoDTO { + + @ApiModelProperty("相关的会销面试发起人 userId") + private String userId; + + @ApiModelProperty("相关的会销面试发起人姓名") + private String exhibitionInterviewerName; + + @ApiModelProperty("相关的会销面试发起人手机号") + private String exhibitionInterviewerMobile; + + @ApiModelProperty("会销面试计划 id") + private String exhibitionInterviewPlanId; + + @ApiModelProperty("会销面试发起时间") + private String exhibitionInterviewTime; + +} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java index a13c22b05..8351578fc 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java @@ -9,6 +9,7 @@ import com.cool.store.constants.RedisConstant; import com.cool.store.context.LoginUserInfo; import com.cool.store.dao.*; import com.cool.store.dto.buser.UserPositionAndUserScopeDTO; +import com.cool.store.dto.exhibition.ExhibitionInterviewInfoDTO; import com.cool.store.dto.log.*; import com.cool.store.dto.partner.*; import com.cool.store.entity.*; @@ -162,6 +163,14 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { HyOpenAreaInfoDO hyOpenAreaInfoDO = hyOpenAreaInfoDAO.selectById(Long.valueOf(partnerLineInfoAndBaseInfoDTO.getWantShopArea())); partnerLineInfoAndBaseInfoVO.setWantShopAreaName(hyOpenAreaInfoDO.getAreaPath().replace("/", " ")); } + //如果是会销面试的线索意向申请同意人和同意时间取发起会销面试的人和时间 + if (partnerLineInfoAndBaseInfoVO.getPassUserName() == null && partnerLineInfoAndBaseInfoVO.getPassTime() == null) { + ExhibitionInterviewInfoDTO exhibitionInterviewInfo = partnerExhibitionDAO.getStartInterviewInfo(partnerLineInfoAndBaseInfoVO.getId()); + partnerLineInfoAndBaseInfoVO.setPassUserId(exhibitionInterviewInfo.getUserId()); + partnerLineInfoAndBaseInfoVO.setPassUserName(exhibitionInterviewInfo.getExhibitionInterviewerName()); + partnerLineInfoAndBaseInfoVO.setPassUserMobile(exhibitionInterviewInfo.getExhibitionInterviewerMobile()); + partnerLineInfoAndBaseInfoVO.setPassTime(DateUtil.format(DateUtil.parseDateTime(exhibitionInterviewInfo.getExhibitionInterviewTime()), CoolDateUtils.DATE_FORMAT_SEC_2)); + } return partnerLineInfoAndBaseInfoVO; }