suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev/feat/partner1.6_20231226' into dev/feat/partner1.6_20231226

Browse Source
This commit is contained in:
feng.li
2023-12-25 11:54:16 +08:00
parent 9beb5d39e8 390a9987c3
commit ab5c822e24
3 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
coolstore-partner-dao/src/main/resources/mapper/HyPartnerExhibitionMapper.xml
View File

@@ -103,6 +103,9 @@
<if test="exhibitionId != null">
and hpe.exhibition_id = #{exhibitionId,jdbcType=BIGINT}
</if>
<if test="participationStatus == null">
and hpe.participation_status in (0,7)
</if>
<if test="participationStatus != null">
<if test="participationStatus==4">
and hpe.participation_status in (4,5,6)

2
coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/ExhibitionDetailVO.java
View File

@@ -22,4 +22,6 @@ public class ExhibitionDetailVO extends ExhibitionVO{
private Integer closedType;
private String exhibitionCode;
}

2
coolstore-partner-service/src/main/java/com/cool/store/service/impl/exhibition/ExhibitionServiceImpl.java
View File

@@ -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());
@@ -589,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);