From 275317afd500da9588f7e60d8c13a253c4e9a12c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Mon, 25 Dec 2023 10:18:27 +0800 Subject: [PATCH 1/2] exhibitionCode --- .../src/main/resources/mapper/HyPartnerExhibitionMapper.xml | 3 +++ .../java/com/cool/store/vo/exhibition/ExhibitionDetailVO.java | 2 ++ .../store/service/impl/exhibition/ExhibitionServiceImpl.java | 1 + 3 files changed, 6 insertions(+) diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerExhibitionMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerExhibitionMapper.xml index ad319443a..a44474187 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerExhibitionMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerExhibitionMapper.xml @@ -103,6 +103,9 @@ and hpe.exhibition_id = #{exhibitionId,jdbcType=BIGINT} + + and hpe.participation_status in (0,7) + and hpe.participation_status in (4,5,6) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/ExhibitionDetailVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/ExhibitionDetailVO.java index 9c782f4fc..9fa5d0dcd 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/ExhibitionDetailVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/ExhibitionDetailVO.java @@ -22,4 +22,6 @@ public class ExhibitionDetailVO extends ExhibitionVO{ private Integer closedType; + private String exhibitionCode; + } 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 cf8cd153e..df8415f8f 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 @@ -399,6 +399,7 @@ public class ExhibitionServiceImpl implements ExhibitionService { ExhibitionDetailVO exhibitionDetailVO = new ExhibitionDetailVO(); exhibitionDetailVO.setExhibitionName(hyExhibitionDO.getExhibitionName()); exhibitionDetailVO.setId(hyExhibitionDO.getId()); + exhibitionDetailVO.setExhibitionCode(hyExhibitionDO.getExhibitionCode()); exhibitionDetailVO.setLocation(hyExhibitionDO.getLocation()); exhibitionDetailVO.setStartDate(DateUtil.format(hyExhibitionDO.getStartDate(), CoolDateUtils.DATE_FORMAT_DAY_2)); exhibitionDetailVO.setClosedType(hyExhibitionDO.getClosedType()); From 390a9987c33d93f161fe572fed0eab331219795e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Mon, 25 Dec 2023 10:20:05 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=8A=A5=E5=90=8D=E4=BC=9A=E9=94=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/service/impl/exhibition/ExhibitionServiceImpl.java | 1 + 1 file changed, 1 insertion(+) 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 291e72c85..cbcc1ccc6 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 @@ -590,6 +590,7 @@ public class ExhibitionServiceImpl implements ExhibitionService { partnerExhibition.setParticipationStatus(ExhibitionPartnerStatus.REGISTERED.getCode()); partnerExhibition.setWantShopArea(signUpExhibitionDTO.getWantShopArea()); partnerExhibition.setInvestmentManagerName(signUpExhibitionDTO.getIntendedAccountManager()); + partnerExhibition.setCreateTime(new Date()); partnerExhibition.setExpectedVisitorsCount(signUpExhibitionDTO.getExpectedVisitorsCount()); partnerExhibition.setExpectedInformation(signUpExhibitionDTO.getExpectedInformation()); hyPartnerExhibitionDAO.updateByPrimaryKeySelective(partnerExhibition);