From 00598ca30878a8fb42d7aed6546997388629e551 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Mon, 11 Sep 2023 14:50:41 +0800 Subject: [PATCH] =?UTF-8?q?BaseInfo=20=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/HyPartnerLineInfoMapper.xml | 2 ++ .../store/dto/partner/PartnerLineInfoAndBaseInfoDTO.java | 6 ++++++ .../com/cool/store/vo/PartnerLineInfoAndBaseInfoVO.java | 6 ++++++ .../store/service/impl/HyPartnerLineInfoServiceImpl.java | 2 ++ 4 files changed, 16 insertions(+) diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml index 36a641990..3a7f6ec18 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml @@ -356,6 +356,8 @@ hpuinfo.username as partnerUserName, hpuc.channel_name as channelName, hpii.education as education, + hpii.detailed_address as detailAddress, + hpii.email as email, hpl.phone_address as phoneAddress from hy_partner_line_info a left join hy_partner_base_info b on a.id = b.partner_line_id diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PartnerLineInfoAndBaseInfoDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PartnerLineInfoAndBaseInfoDTO.java index c2c53eef2..e9f9b6b8e 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PartnerLineInfoAndBaseInfoDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PartnerLineInfoAndBaseInfoDTO.java @@ -84,4 +84,10 @@ public class PartnerLineInfoAndBaseInfoDTO { private String education; private String developmentDirector; + + @ApiModelProperty("详细地址") + private String detailedAddress; + + @ApiModelProperty("邮箱") + private String email; } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerLineInfoAndBaseInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerLineInfoAndBaseInfoVO.java index 8e86fd176..a62494424 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerLineInfoAndBaseInfoVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerLineInfoAndBaseInfoVO.java @@ -76,6 +76,12 @@ public class PartnerLineInfoAndBaseInfoVO { @ApiModelProperty("常驻区域") private String liveArea; + @ApiModelProperty("详细地址") + private String detailedAddress; + + @ApiModelProperty("邮箱") + private String email; + @ApiModelProperty("意向开店区域") private String wantShopArea; 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 a97408ac9..39bcde03f 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 @@ -907,6 +907,8 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { partnerLineInfoAndBaseInfoVO.setAcceptAdjustType(partnerLineInfoAndBaseInfoDTO.getAcceptAdjustType()); partnerLineInfoAndBaseInfoVO.setWantShopArea(partnerLineInfoAndBaseInfoDTO.getWantShopArea()); partnerLineInfoAndBaseInfoVO.setLiveArea(partnerLineInfoAndBaseInfoDTO.getLiveArea()); + partnerLineInfoAndBaseInfoVO.setDetailedAddress(partnerLineInfoAndBaseInfoDTO.getDetailedAddress()); + partnerLineInfoAndBaseInfoVO.setEmail(partnerLineInfoAndBaseInfoDTO.getEmail()); partnerLineInfoAndBaseInfoVO.setIdCard(partnerLineInfoAndBaseInfoDTO.getIdCard()); partnerLineInfoAndBaseInfoVO.setChannelName(partnerLineInfoAndBaseInfoDTO.getChannelName()); partnerLineInfoAndBaseInfoVO.setDevelopmentDirector(partnerLineInfoAndBaseInfoDTO.getDevelopmentDirector());