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

Merge branch 'dev/feat/partner1.6_20231226' into pre

Browse Source
This commit is contained in:
苏竹红
2024-01-04 11:15:24 +08:00
parent 450a307f9b f8a6b47e40
commit 8a075d227e
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerUserInfoServiceImpl.java
View File

@@ -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);

2
coolstore-partner-webc/src/main/java/com/cool/store/controller/PartnerController.java
View File

@@ -257,7 +257,7 @@ public class PartnerController {
@GetMapping(path = "/getPartnerInfo")
@ApiOperation("线索基本信息")
public ResponseResult<PartnerUserBaseVO> 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));
}