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 60c2e3b4c..8dc3df9fa 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 @@ -167,7 +167,6 @@ public class PartnerUserInfoServiceImpl implements PartnerUserInfoService { if (hyPartnerUserInfoDO == null||hyPartnerLineInfoDO== null){ return null; } - HyExhibitionDO hyExhibitionDO = hyExhibitionDAO.selectByPrimaryKey(exhibitionId); PartnerUserBaseVO partnerUserBaseVO = new PartnerUserBaseVO(hyPartnerUserInfoDO.getMobile(), hyPartnerUserInfoDO.getUsername(), hyPartnerUserInfoDO.getWantShopArea()); //黑名单 @@ -193,14 +192,17 @@ public class PartnerUserInfoServiceImpl implements PartnerUserInfoService { } } //是否重复报名(已结束的展会不算) - 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; + 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; + } } partnerUserBaseVO.setSignUpStatus(Boolean.TRUE); partnerUserBaseVO.setSignUpFailCode(CommonConstants.ZERO); diff --git a/coolstore-partner-webc/src/main/java/com/cool/store/controller/PartnerController.java b/coolstore-partner-webc/src/main/java/com/cool/store/controller/PartnerController.java index 1e2abb360..b5800c877 100644 --- a/coolstore-partner-webc/src/main/java/com/cool/store/controller/PartnerController.java +++ b/coolstore-partner-webc/src/main/java/com/cool/store/controller/PartnerController.java @@ -257,7 +257,7 @@ public class PartnerController { @GetMapping(path = "/getPartnerInfo") @ApiOperation("线索基本信息") public ResponseResult getPartnerInfo(@RequestParam(value = "mobile")String mobile, - @RequestParam(value = "exhibitionId")Integer exhibitionId){ + @RequestParam(value = "exhibitionId" ,required = false)Integer exhibitionId){ return ResponseResult.success(partnerUserInfoService.getPartnerInfo(mobile,exhibitionId)); }