diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/PartnerUserInfoService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/PartnerUserInfoService.java index d3f8f71ea..4abf5862b 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/PartnerUserInfoService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/PartnerUserInfoService.java @@ -19,5 +19,5 @@ public interface PartnerUserInfoService { ApplyBaseInfoVO updatePartnerUserInfo(PartnerUserInfoRequest partnerUserInfoRequest) throws ApiException; - PartnerUserBaseVO getPartnerInfo(String mobile,Integer exhibitionId); + PartnerUserBaseVO getPartnerInfo(String mobile,Integer exhibitionId,Integer exhibitionGroupId); } 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 8dc3df9fa..c1c55ad12 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 @@ -158,7 +158,7 @@ public class PartnerUserInfoServiceImpl implements PartnerUserInfoService { @Override - public PartnerUserBaseVO getPartnerInfo(String mobile,Integer exhibitionId) { + public PartnerUserBaseVO getPartnerInfo(String mobile,Integer exhibitionId,Integer groupId) { HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByMobile(mobile); HyPartnerLineInfoDO hyPartnerLineInfoDO = null; if (hyPartnerUserInfoDO != null){ @@ -191,7 +191,7 @@ public class PartnerUserInfoServiceImpl implements PartnerUserInfoService { return partnerUserBaseVO; } } - //是否重复报名(已结束的展会不算) + //是否重复报名(已结束的展会不算) PC if (exhibitionId!=null){ HyExhibitionDO hyExhibitionDO = hyExhibitionDAO.selectByPrimaryKey(exhibitionId); Integer exhibitionGroupId = hyExhibitionDO.getExhibitionGroupId(); @@ -204,6 +204,13 @@ public class PartnerUserInfoServiceImpl implements PartnerUserInfoService { return partnerUserBaseVO; } } + //移动 + if(groupId!=null){ + Integer count = hyExhibitionDAO.lineSignUpCount(groupId, hyPartnerLineInfoDO.getId()); + if (count == 0){ + return partnerUserBaseVO; + } + } partnerUserBaseVO.setSignUpStatus(Boolean.TRUE); partnerUserBaseVO.setSignUpFailCode(CommonConstants.ZERO); return partnerUserBaseVO; diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java index 42f9970e1..d3a9d463a 100644 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java +++ b/coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java @@ -348,6 +348,6 @@ public class DeskController { @ApiOperation("线索基本信息") public ResponseResult getPartnerInfo(@RequestParam(value = "mobile")String mobile, @RequestParam(value = "exhibitionId")Integer exhibitionId){ - return ResponseResult.success(partnerUserInfoService.getPartnerInfo(mobile,exhibitionId)); + return ResponseResult.success(partnerUserInfoService.getPartnerInfo(mobile,exhibitionId,null)); } } 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 b5800c877..c5c89c763 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,8 +257,8 @@ public class PartnerController { @GetMapping(path = "/getPartnerInfo") @ApiOperation("线索基本信息") public ResponseResult getPartnerInfo(@RequestParam(value = "mobile")String mobile, - @RequestParam(value = "exhibitionId" ,required = false)Integer exhibitionId){ - return ResponseResult.success(partnerUserInfoService.getPartnerInfo(mobile,exhibitionId)); + @RequestParam(value = "exhibitionGroupId" )Integer exhibitionGroupId){ + return ResponseResult.success(partnerUserInfoService.getPartnerInfo(mobile,null,exhibitionGroupId)); } }