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 b873be751..97b462fa2 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 @@ -106,8 +106,8 @@ public class HyExhibitionDAO { return hyExhibitionMapper.listByExhibitionGroupIds(exhibitionGroupIdList,filterCloseExhibition); } - public Integer lineSignUpCount(Integer exhibitionGroupId, Long lineId){ - return hyExhibitionMapper.lineSignUpCount(exhibitionGroupId,lineId); + public ExhibitionDTO lineSignUp(Integer exhibitionGroupId, Long lineId){ + return hyExhibitionMapper.lineSignUp(exhibitionGroupId,lineId); } public List listByExhibitionGroupId(Integer exhibitionGroupId,Boolean includeClose){ 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 4f1a06762..18d56e261 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 @@ -56,7 +56,7 @@ public interface HyExhibitionMapper { List listByExhibitionGroupIds(@Param("list") List exhibitionGroupIdList, @Param("filterCloseExhibition") Boolean filterCloseExhibition); - Integer lineSignUpCount(@Param("exhibitionGroupId") Integer exhibitionGroupId, @Param("lineId") Long lineId); + ExhibitionDTO lineSignUp(@Param("exhibitionGroupId") Integer exhibitionGroupId, @Param("lineId") Long lineId); /** * 查询展会组下展会 (参数控制是否包含关闭的展会) diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyExhibitionMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyExhibitionMapper.xml index e93a295b8..b7a9ae113 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyExhibitionMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyExhibitionMapper.xml @@ -339,8 +339,8 @@ - + select a.exhibition_name as exhibitionName from hy_exhibition a left join hy_partner_exhibition b on a.id = b.exhibition_id and b.participation_status!=7 and a.closed_type = 0 diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerUserInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerUserInfoServiceImpl.java index c1c55ad12..393f0249f 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerUserInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerUserInfoServiceImpl.java @@ -6,6 +6,7 @@ import com.cool.store.constants.CommonConstants; import com.cool.store.constants.RedisConstant; import com.cool.store.context.PartnerUserHolder; import com.cool.store.dao.*; +import com.cool.store.dto.exhibition.ExhibitionDTO; import com.cool.store.dto.log.UserInfoUpdateDTO; import com.cool.store.entity.*; import com.cool.store.enums.*; @@ -194,20 +195,15 @@ public class PartnerUserInfoServiceImpl implements PartnerUserInfoService { //是否重复报名(已结束的展会不算) PC if (exhibitionId!=null){ HyExhibitionDO hyExhibitionDO = hyExhibitionDAO.selectByPrimaryKey(exhibitionId); - Integer exhibitionGroupId = hyExhibitionDO.getExhibitionGroupId(); - Integer count = hyExhibitionDAO.lineSignUpCount(exhibitionGroupId, hyPartnerLineInfoDO.getId()); - if (count > 0){ - HyExhibitionGroupDO hyExhibitionGroupDO = hyExhibitionGroupDAO.selectByPrimaryKey(exhibitionGroupId); - partnerUserBaseVO.setSignUpStatus(Boolean.FALSE); - partnerUserBaseVO.setSignUpFailCode(CommonConstants.THREE); - partnerUserBaseVO.setSignUpFailMsg(SignUpStatusEnum.getSignUpFailMsg(SignUpStatusEnum.Sign_UP_FAIL_3,hyExhibitionGroupDO.getExhibitionGroupName())); - return partnerUserBaseVO; - } + groupId = hyExhibitionDO.getExhibitionGroupId(); } //移动 if(groupId!=null){ - Integer count = hyExhibitionDAO.lineSignUpCount(groupId, hyPartnerLineInfoDO.getId()); - if (count == 0){ + ExhibitionDTO exhibitionDTO = hyExhibitionDAO.lineSignUp(groupId, hyPartnerLineInfoDO.getId()); + if (exhibitionDTO !=null){ + partnerUserBaseVO.setSignUpStatus(Boolean.FALSE); + partnerUserBaseVO.setSignUpFailCode(CommonConstants.THREE); + partnerUserBaseVO.setSignUpFailMsg(SignUpStatusEnum.getSignUpFailMsg(SignUpStatusEnum.Sign_UP_FAIL_3,exhibitionDTO.getExhibitionName())); return partnerUserBaseVO; } } 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 d39ea4daa..2d178adf7 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 @@ -625,10 +625,9 @@ public class ExhibitionServiceImpl implements ExhibitionService { } //是否重复报名(已结束的展会不算) Integer exhibitionGroupId = hyExhibitionDO.getExhibitionGroupId(); - Integer count = hyExhibitionDAO.lineSignUpCount(exhibitionGroupId, lineId); - if (count > 0){ - HyExhibitionGroupDO hyExhibitionGroupDO = hyExhibitionGroupDAO.selectByPrimaryKey(exhibitionGroupId); - return new SignUpExhibitionVO(Boolean.FALSE,CommonConstants.THREE,SignUpStatusEnum.getSignUpFailMsg(SignUpStatusEnum.Sign_UP_FAIL_3,hyExhibitionGroupDO.getExhibitionGroupName())); + ExhibitionDTO exhibitionDTO = hyExhibitionDAO.lineSignUp(exhibitionGroupId, lineId); + if (exhibitionDTO != null){ + return new SignUpExhibitionVO(Boolean.FALSE,CommonConstants.THREE,SignUpStatusEnum.getSignUpFailMsg(SignUpStatusEnum.Sign_UP_FAIL_3,exhibitionDTO.getExhibitionName())); } //开始报名 //判断是否之前报名过该会销