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

getPartnerInfo 添加字段

Browse Source
This commit is contained in:
苏竹红
2023-12-26 12:11:54 +08:00
parent 483b60bf95
commit a34c9063df
11 changed files with 73 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coolstore-partner-service/src/main/java/com/cool/store/service/PartnerUserInfoService.java
View File

@@ -19,5 +19,5 @@ public interface PartnerUserInfoService {
ApplyBaseInfoVO updatePartnerUserInfo(PartnerUserInfoRequest partnerUserInfoRequest) throws ApiException;
PartnerUserBaseVO getPartnerInfo(String mobile);
PartnerUserBaseVO getPartnerInfo(String mobile,Integer exhibitionId);
}

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

@@ -4,15 +4,11 @@ import com.alibaba.fastjson.JSONObject;
import com.cool.store.constants.CommonConstants;
import com.cool.store.constants.RedisConstant;
import com.cool.store.context.PartnerUserHolder;
import com.cool.store.dao.HyOpenAreaInfoDAO;
import com.cool.store.dao.HyPartnerUserInfoDAO;
import com.cool.store.dao.*;
import com.cool.store.dto.log.UserInfoUpdateDTO;
import com.cool.store.dto.partner.MobileCheckDTO;
import com.cool.store.entity.HyOpenAreaInfoDO;
import com.cool.store.entity.HyPartnerLineInfoDO;
import com.cool.store.entity.HyPartnerUserInfoDO;
import com.cool.store.enums.ErrorCodeEnum;
import com.cool.store.enums.OperateTypeEnum;
import com.cool.store.entity.*;
import com.cool.store.enums.*;
import com.cool.store.exception.ApiException;
import com.cool.store.exception.ServiceException;
import com.cool.store.request.PartnerIntentInfoRequest;
@@ -23,6 +19,7 @@ import com.cool.store.utils.RedisUtilPool;
import com.cool.store.vo.ApplyBaseInfoVO;
import com.cool.store.vo.InviteCodeDetailVO;
import com.cool.store.vo.PartnerUserInfoVO;
import com.cool.store.vo.exhibition.SignUpExhibitionVO;
import com.cool.store.vo.partner.PartnerUserBaseVO;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
@@ -32,9 +29,8 @@ import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.text.MessageFormat;
import java.util.Date;
import java.util.List;
import java.util.Objects;
import java.util.*;
import java.util.stream.Collectors;
@Service
@Slf4j
@@ -153,14 +149,61 @@ public class PartnerUserInfoServiceImpl implements PartnerUserInfoService {
logService.recordPartnerBizLog(operator,hyPartnerLineInfoDO.getId(), OperateTypeEnum.USERINFO_UPDATE,log);
return applyBaseInfoVO;
}
@Resource
HyPartnerLineInfoDAO hyPartnerLineInfoDAO;
@Resource
HyExhibitionDAO hyExhibitionDAO;
@Resource
HyExhibitionGroupDAO hyExhibitionGroupDAO;
@Override
public PartnerUserBaseVO getPartnerInfo(String mobile) {
public PartnerUserBaseVO getPartnerInfo(String mobile,Integer exhibitionId) {
HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByMobile(mobile);
if (hyPartnerUserInfoDO == null){
HyPartnerLineInfoDO hyPartnerLineInfoDO = null;
if (hyPartnerUserInfoDO != null){
hyPartnerLineInfoDO = hyPartnerLineInfoDAO.getByPartnerId(hyPartnerUserInfoDO.getPartnerId());
}
if (hyPartnerUserInfoDO == null||hyPartnerLineInfoDO== null){
return null;
}
return new PartnerUserBaseVO(hyPartnerUserInfoDO.getMobile(),hyPartnerUserInfoDO.getUsername(),hyPartnerUserInfoDO.getWantShopArea());
HyExhibitionDO hyExhibitionDO = hyExhibitionDAO.selectByPrimaryKey(exhibitionId);
PartnerUserBaseVO partnerUserBaseVO = new PartnerUserBaseVO(hyPartnerUserInfoDO.getMobile(), hyPartnerUserInfoDO.getUsername(), hyPartnerUserInfoDO.getWantShopArea());
//黑名单
if (LineStatusEnum.BLACKLIST.getCode().equals(hyPartnerLineInfoDO.getLineStatus())){
partnerUserBaseVO.setSignUpStatus(Boolean.FALSE);
partnerUserBaseVO.setSignUpFailCode(CommonConstants.TWO);
partnerUserBaseVO.setSignUpFailMsg(SignUpStatusEnum.getSignUpFailMsg(SignUpStatusEnum.Sign_UP_FAIL_4));
return partnerUserBaseVO;
}
//私海
//能报名的列表
Map<String,List<String>> map = WorkflowStageEnum.getExhibitionSignUpMap();
if (LineStatusEnum.PRIVATE_SEAS.getCode().equals(hyPartnerLineInfoDO.getLineStatus())){
List<String> list = map.get(hyPartnerLineInfoDO.getWorkflowStage());
if (!list.contains(hyPartnerLineInfoDO.getWorkflowStatus())){
HashMap<String, List<WorkflowStatusEnum>> workflowStatusMap = WorkflowStageEnum.getWorkflowStatusMap();
List<WorkflowStatusEnum> workflowStatusEnums = workflowStatusMap.get(hyPartnerLineInfoDO.getWorkflowStage());
Map<String, String> statusMap = workflowStatusEnums.stream().collect(Collectors.toMap(WorkflowStatusEnum::getCode, WorkflowStatusEnum::getMessage, (a, b) -> b));
partnerUserBaseVO.setSignUpStatus(Boolean.FALSE);
partnerUserBaseVO.setSignUpFailCode(CommonConstants.TWO);
partnerUserBaseVO.setSignUpFailMsg(SignUpStatusEnum.getSignUpFailMsg(SignUpStatusEnum.Sign_UP_FAIL_2,WorkflowStageEnum.getWorkflowStageByCode(hyPartnerLineInfoDO.getWorkflowStage()).getMessage(),statusMap.get(hyPartnerLineInfoDO.getWorkflowStatus())));
return partnerUserBaseVO;
}
}
//是否重复报名（已结束的展会不算）
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);
return partnerUserBaseVO;
}
private void fillUserInfoDOByRequest(HyPartnerUserInfoDO hyPartnerUserInfoDO, PartnerUserInfoRequest partnerUserInfoRequest) {

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

@@ -483,6 +483,7 @@ public class ExhibitionServiceImpl implements ExhibitionService {
exhibitionLineVO.setInvestmentManagerName(investment.getInvestmentManagerName());
exhibitionLineVO.setInvestmentManagerMobile(investment.getInvestmentManagerMobile());
exhibitionLineVO.setInterviewer(inter.getInterviewer());
exhibitionLineVO.setInterviewPlanId(inter.getId());
exhibitionLineVO.setInterviewerName(inter.getInterviewerName());
exhibitionLineVO.setInterviewerMobile(inter.getInterviewerMobile());
result.add(exhibitionLineVO);