From fae3b4408e3bcbd518d7069a4f2852ec78678813 Mon Sep 17 00:00:00 2001 From: "feng.li" Date: Mon, 18 Dec 2023 17:45:54 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=BA=BF=E7=B4=A2=E6=8A=A5?= =?UTF-8?q?=E5=90=8D=E7=9A=84=E4=BC=9A=E9=94=80=E5=88=97=E8=A1=A8=E5=8F=8A?= =?UTF-8?q?=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/dao/HyExhibitionDAO.java | 17 ++++++++-- .../cool/store/mapper/HyExhibitionMapper.java | 19 +++++++++-- .../resources/mapper/HyExhibitionMapper.xml | 33 +++++++++++++++++++ .../exhibition/PartnerExhibitionInfoVO.java | 29 ++++++++++++++++ .../exhibition/PartnerExhibitionListVO.java | 26 +++++++++++++++ .../cool/store/service/ExhibitionService.java | 16 +++++++++ .../exhibition/ExhibitionServiceImpl.java | 11 +++++++ .../controller/ExhibitionController.java | 21 ++++++++++-- 8 files changed, 166 insertions(+), 6 deletions(-) create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/PartnerExhibitionInfoVO.java create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/PartnerExhibitionListVO.java diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyExhibitionDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyExhibitionDAO.java index 6f7d8f3cc..fc29851fc 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyExhibitionDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyExhibitionDAO.java @@ -5,9 +5,9 @@ import com.cool.store.dto.exhibition.ExhibitionStatisticsDTO; import com.cool.store.entity.HyExhibitionDO; import com.cool.store.mapper.HyExhibitionMapper; import com.cool.store.utils.StringUtil; -import io.swagger.models.auth.In; +import com.cool.store.vo.exhibition.PartnerExhibitionInfoVO; +import com.cool.store.vo.exhibition.PartnerExhibitionListVO; import org.apache.commons.collections4.CollectionUtils; -import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; import javax.annotation.Resource; @@ -119,4 +119,17 @@ public class HyExhibitionDAO { return hyExhibitionMapper.listByExhibitionGroupId(exhibitionGroupId,includeClose); } + public List getPartnerExhibitionList(Long partnerLineId) { + if (partnerLineId == null) { + return new ArrayList<>(); + } + return hyExhibitionMapper.getPartnerExhibitionList(partnerLineId); + } + + public PartnerExhibitionInfoVO getPartnerExhibitionInfo(Integer exhibitionId, Long partnerLineId) { + if (exhibitionId == null || partnerLineId == null) { + return new PartnerExhibitionInfoVO(); + } + return hyExhibitionMapper.getPartnerExhibitionInfo(exhibitionId, partnerLineId); + } } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyExhibitionMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyExhibitionMapper.java index 5149db9b4..c8b08f23e 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyExhibitionMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyExhibitionMapper.java @@ -3,9 +3,9 @@ package com.cool.store.mapper; import com.cool.store.dto.exhibition.ExhibitionDTO; import com.cool.store.dto.exhibition.ExhibitionStatisticsDTO; import com.cool.store.entity.HyExhibitionDO; -import io.swagger.models.auth.In; +import com.cool.store.vo.exhibition.PartnerExhibitionInfoVO; +import com.cool.store.vo.exhibition.PartnerExhibitionListVO; import org.apache.ibatis.annotations.Param; -import tk.mybatis.mapper.common.Mapper; import java.util.List; @@ -66,4 +66,19 @@ public interface HyExhibitionMapper { */ List listByExhibitionGroupId(@Param("exhibitionGroupId") Integer exhibitionGroupId, @Param("includeClose") Boolean includeClose); + /** + * 获取线索报名参加的会销列表 + * @param partnerLineId + * @return + */ + List getPartnerExhibitionList(@Param("partnerLineId") Long partnerLineId); + + /** + * 获取线索报名的会销详情 + * + * @param exhibitionId + * @param partnerLineId + * @return + */ + PartnerExhibitionInfoVO getPartnerExhibitionInfo(@Param("exhibitionId") Integer exhibitionId, @Param("partnerLineId") Long partnerLineId); } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyExhibitionMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyExhibitionMapper.xml index bf572047f..08cb09102 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyExhibitionMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyExhibitionMapper.xml @@ -372,4 +372,37 @@ + + + + + \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/PartnerExhibitionInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/PartnerExhibitionInfoVO.java new file mode 100644 index 000000000..a7508f744 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/PartnerExhibitionInfoVO.java @@ -0,0 +1,29 @@ +package com.cool.store.vo.exhibition; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Fun Li 2023/12/18 17:15 + * @version 1.0 + * 线索报名的会销详情 + */ +@Data +public class PartnerExhibitionInfoVO { + + @ApiModelProperty(value = "参会人名称", example = "John Doe") + private String participantName; + + @ApiModelProperty(value = "报名的展会编号", example = "34632023") + private String exhibitionCode; + + @ApiModelProperty(value = "参加的相应展会名称", example = "某某某次展会") + private String exhibitionName; + + @ApiModelProperty(value = "展会时间", example = "2023-07-25") + private String exhibitionDate; + + @ApiModelProperty(value = "展会地点", example = "维也纳大酒店") + private String exhibitionPosition; + +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/PartnerExhibitionListVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/PartnerExhibitionListVO.java new file mode 100644 index 000000000..f499c8c22 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/PartnerExhibitionListVO.java @@ -0,0 +1,26 @@ +package com.cool.store.vo.exhibition; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Fun Li 2023/12/18 16:42 + * @version 1.0 + * 线索报名的会销列表 + */ +@Data +public class PartnerExhibitionListVO { + + @ApiModelProperty(value = "展会id", example = "123") + private String exhibitionId; + + @ApiModelProperty(value = "展会编号", example = "12202312") + private String exhibitionCode; + + @ApiModelProperty(value = "展会名称", example = "某某某次展会") + private String exhibitionName; + + @ApiModelProperty(value = "展会时间", example = "2023-07-25") + private String exhibitionDate; + +} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/ExhibitionService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/ExhibitionService.java index 0b069c572..5b4fff3c0 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/ExhibitionService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/ExhibitionService.java @@ -137,4 +137,20 @@ public interface ExhibitionService { * @return */ Boolean closeExhibition(Integer exhibitionId,LoginUserInfo userInfo); + + /** + * 获取线索参加的会销列表 + * @param partnerLineId + * @return + */ + List getPartnerExhibitionList(Long partnerLineId); + + /** + * 获取线索参加的会销详情 + * + * @param exhibitionId + * @param partnerLineId + * @return + */ + PartnerExhibitionInfoVO getExhibitionInfo(Integer exhibitionId, Long partnerLineId); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/exhibition/ExhibitionServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/exhibition/ExhibitionServiceImpl.java index 63a8a2fbc..1a4e92f12 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/exhibition/ExhibitionServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/exhibition/ExhibitionServiceImpl.java @@ -677,6 +677,17 @@ public class ExhibitionServiceImpl implements ExhibitionService { return Boolean.TRUE; } + + @Override + public List getPartnerExhibitionList(Long partnerLineId) { + return hyExhibitionDAO.getPartnerExhibitionList(partnerLineId); + } + + @Override + public PartnerExhibitionInfoVO getExhibitionInfo(Integer exhibitionId, Long partnerLineId) { + return hyExhibitionDAO.getPartnerExhibitionInfo(exhibitionId, partnerLineId); + } + /** * 计算是否会销中 * @param lineId diff --git a/coolstore-partner-webc/src/main/java/com/cool/store/controller/ExhibitionController.java b/coolstore-partner-webc/src/main/java/com/cool/store/controller/ExhibitionController.java index 4082b8c81..8c5842ad3 100644 --- a/coolstore-partner-webc/src/main/java/com/cool/store/controller/ExhibitionController.java +++ b/coolstore-partner-webc/src/main/java/com/cool/store/controller/ExhibitionController.java @@ -1,11 +1,14 @@ package com.cool.store.controller; -import com.cool.store.context.CurrentUserHolder; import com.cool.store.context.LoginUserInfo; +import com.cool.store.context.PartnerUserHolder; import com.cool.store.dto.exhibition.SignUpExhibitionDTO; import com.cool.store.exception.ApiException; import com.cool.store.response.ResponseResult; import com.cool.store.service.ExhibitionService; +import com.cool.store.vo.PartnerUserInfoVO; +import com.cool.store.vo.exhibition.PartnerExhibitionInfoVO; +import com.cool.store.vo.exhibition.PartnerExhibitionListVO; import com.cool.store.vo.exhibition.SignUpExhibitionVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -13,6 +16,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.util.List; /** * @Author suzhuhong @@ -28,7 +32,6 @@ public class ExhibitionController { @Resource ExhibitionService exhibitionService; - @ApiOperation("报名会销") @PostMapping("/signUpExhibition") public ResponseResult signUpExhibition(@RequestBody SignUpExhibitionDTO dto) throws ApiException { @@ -41,4 +44,18 @@ public class ExhibitionController { return ResponseResult.success(exhibitionService.getExhibitionGroupDetail(exhibitionGroupId,Boolean.FALSE,Boolean.TRUE)); } + @GetMapping(value = "/getPartnerExhibitionList") + @ApiOperation("线索参加的会销列表") + public ResponseResult> getPartnerExhibitionList() { + PartnerUserInfoVO user = PartnerUserHolder.getUser(); + return ResponseResult.success(exhibitionService.getPartnerExhibitionList(user.getPartnerLineId())); + } + + @GetMapping("/getExhibitionInfo") + @ApiOperation("线索参加的会销详情") + public ResponseResult getExhibitionInfo(@RequestParam(required = true, value = "exhibitionId") Integer exhibitionId) { + PartnerUserInfoVO user = PartnerUserHolder.getUser(); + return ResponseResult.success(exhibitionService.getExhibitionInfo(exhibitionId, user.getPartnerLineId())); + } + }