From df754a2f24aa6bd39a86108bc4c2918edfeb8784 Mon Sep 17 00:00:00 2001 From: "feng.li" Date: Fri, 5 Jan 2024 16:25:49 +0800 Subject: [PATCH 1/2] =?UTF-8?q?webc=E6=A0=B9=E6=8D=AE=E4=BC=9A=E9=94=80?= =?UTF-8?q?=E7=BB=84id=E6=9F=A5=E8=AF=A2=E7=BA=BF=E7=B4=A2=E6=8A=A5?= =?UTF-8?q?=E5=90=8D=E4=BC=9A=E9=94=80=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cool/store/dao/HyExhibitionDAO.java | 6 +++--- .../com/cool/store/mapper/HyExhibitionMapper.java | 4 ++-- .../main/resources/mapper/HyExhibitionMapper.xml | 15 ++++++++------- .../com/cool/store/service/ExhibitionService.java | 4 ++-- .../impl/exhibition/ExhibitionServiceImpl.java | 4 ++-- .../store/controller/ExhibitionController.java | 4 ++-- 6 files changed, 19 insertions(+), 18 deletions(-) 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 10858f3b4..b873be751 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 @@ -124,11 +124,11 @@ public class HyExhibitionDAO { return hyExhibitionMapper.getPartnerExhibitionList(partnerLineId); } - public PartnerExhibitionInfoVO getPartnerExhibitionInfo(Integer exhibitionId, Long partnerLineId) { - if (exhibitionId == null || partnerLineId == null) { + public PartnerExhibitionInfoVO getPartnerExhibitionInfo(Integer exhibitionGroupId, Long partnerLineId) { + if (exhibitionGroupId == null || partnerLineId == null) { return new PartnerExhibitionInfoVO(); } - return hyExhibitionMapper.getPartnerExhibitionInfo(exhibitionId, partnerLineId); + return hyExhibitionMapper.getPartnerExhibitionInfo(exhibitionGroupId, partnerLineId); } public List querySelective(HyExhibitionDO hyExhibitionDO) { 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 ef99003bf..4f1a06762 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 @@ -76,11 +76,11 @@ public interface HyExhibitionMapper { /** * 获取线索报名的会销详情 * - * @param exhibitionId + * @param exhibitionGroupId * @param partnerLineId * @return */ - PartnerExhibitionInfoVO getPartnerExhibitionInfo(@Param("exhibitionId") Integer exhibitionId, @Param("partnerLineId") Long partnerLineId); + PartnerExhibitionInfoVO getPartnerExhibitionInfo(@Param("exhibitionGroupId") Integer exhibitionGroupId, @Param("partnerLineId") Long partnerLineId); /** * 查询符合条件的会销列表 diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyExhibitionMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyExhibitionMapper.xml index 2a5195626..e93a295b8 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyExhibitionMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyExhibitionMapper.xml @@ -451,13 +451,14 @@ t1.start_date AS exhibitionDate, t1.location AS exhibitionPosition FROM `hy_exhibition` t1 - INNER JOIN `hy_partner_exhibition` t2 ON t1.id = t2.exhibition_id - WHERE t1.deleted = 0 - AND t1.closed_type = 0 - AND t2.deleted = 0 - AND t2.participation_status != 7 - AND t2.partner_line_id = #{partnerLineId} - AND t1.id = #{exhibitionId} + INNER JOIN `hy_partner_exhibition` t2 ON t1.id = t2.exhibition_id + INNER JOIN `hy_exhibition_group` t3 ON t1.exhibition_group_id = t3.id + WHERE t1.deleted = 0 + AND t1.closed_type = 0 + AND t2.deleted = 0 + AND t2.participation_status != 7 + AND t2.partner_line_id = #{partnerLineId} + AND t3.id = #{exhibitionGroupId} 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 af51b2fe2..6d53d8762 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 @@ -155,11 +155,11 @@ public interface ExhibitionService { /** * 获取线索参加的会销详情 * - * @param exhibitionId + * @param exhibitionGroupId * @param partnerLineId * @return */ - PartnerExhibitionInfoVO getExhibitionInfo(Integer exhibitionId, Long partnerLineId); + PartnerExhibitionInfoVO getExhibitionInfo(Integer exhibitionGroupId, 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 894082f3d..4eb0fcd9f 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 @@ -740,8 +740,8 @@ public class ExhibitionServiceImpl implements ExhibitionService { } @Override - public PartnerExhibitionInfoVO getExhibitionInfo(Integer exhibitionId, Long partnerLineId) { - return hyExhibitionDAO.getPartnerExhibitionInfo(exhibitionId, partnerLineId); + public PartnerExhibitionInfoVO getExhibitionInfo(Integer exhibitionGroupId, Long partnerLineId) { + return hyExhibitionDAO.getPartnerExhibitionInfo(exhibitionGroupId, partnerLineId); } @Override 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 8c5842ad3..cc82fe5d6 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 @@ -53,9 +53,9 @@ public class ExhibitionController { @GetMapping("/getExhibitionInfo") @ApiOperation("线索参加的会销详情") - public ResponseResult getExhibitionInfo(@RequestParam(required = true, value = "exhibitionId") Integer exhibitionId) { + public ResponseResult getExhibitionInfo(@RequestParam(required = true, value = "exhibitionGroupId") Integer exhibitionGroupId) { PartnerUserInfoVO user = PartnerUserHolder.getUser(); - return ResponseResult.success(exhibitionService.getExhibitionInfo(exhibitionId, user.getPartnerLineId())); + return ResponseResult.success(exhibitionService.getExhibitionInfo(exhibitionGroupId, user.getPartnerLineId())); } } From f562df93d0d406e4c52802c14cc4822937d571d6 Mon Sep 17 00:00:00 2001 From: "feng.li" Date: Fri, 5 Jan 2024 17:00:43 +0800 Subject: [PATCH 2/2] =?UTF-8?q?webc=E6=A0=B9=E6=8D=AE=E4=BC=9A=E9=94=80?= =?UTF-8?q?=E7=BB=84id=E6=9F=A5=E8=AF=A2=E7=BA=BF=E7=B4=A2=E6=8A=A5?= =?UTF-8?q?=E5=90=8D=E4=BC=9A=E9=94=80=E4=BF=A1=E6=81=AF=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E6=8F=90=E4=BA=A4=E6=84=8F=E5=90=91=E7=94=B3?= =?UTF-8?q?=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cool/store/vo/exhibition/PartnerExhibitionInfoVO.java | 3 +++ .../service/impl/exhibition/ExhibitionServiceImpl.java | 8 +++++++- 2 files changed, 10 insertions(+), 1 deletion(-) 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 index a7508f744..b9212f285 100644 --- 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 @@ -26,4 +26,7 @@ public class PartnerExhibitionInfoVO { @ApiModelProperty(value = "展会地点", example = "维也纳大酒店") private String exhibitionPosition; + @ApiModelProperty("线索是否填写了意向申请") + private Boolean whetherIntentionApply; + } 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 4eb0fcd9f..286f7b623 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 @@ -741,7 +741,13 @@ public class ExhibitionServiceImpl implements ExhibitionService { @Override public PartnerExhibitionInfoVO getExhibitionInfo(Integer exhibitionGroupId, Long partnerLineId) { - return hyExhibitionDAO.getPartnerExhibitionInfo(exhibitionGroupId, partnerLineId); + PartnerExhibitionInfoVO partnerExhibitionInfo = hyExhibitionDAO.getPartnerExhibitionInfo(exhibitionGroupId, partnerLineId); + partnerExhibitionInfo.setWhetherIntentionApply(Boolean.TRUE); + HyPartnerIntentInfoDO intentInfo = hyPartnerIntentInfoDAO.selectByLineId(partnerLineId); + if (intentInfo == null) { + partnerExhibitionInfo.setWhetherIntentionApply(Boolean.FALSE); + } + return partnerExhibitionInfo; } @Override