From f562df93d0d406e4c52802c14cc4822937d571d6 Mon Sep 17 00:00:00 2001
From: "feng.li" <fengli@hsayi.com>
Date: Fri, 5 Jan 2024 17:00:43 +0800
Subject: [PATCH] =?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