From aa73e37f60b05448b71a65c6c88928ea5054c252 Mon Sep 17 00:00:00 2001 From: guohb Date: Wed, 10 Apr 2024 15:40:56 +0800 Subject: [PATCH] InitiatingResponse --- .../src/main/java/com/cool/store/enums/ErrorCodeEnum.java | 1 + .../cool/store/service/impl/JoinIntentionServiceImpl.java | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java index 1c14ffdae..ce1d7ee49 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java @@ -64,6 +64,7 @@ public enum ErrorCodeEnum { ZONE_NOT_EXIST(500004, "战区不存在!", null), PARTNER_BASEINFO_NOT_EXIST(500005, "基本信息不存在!", null), INTENT_INFO_NOT_EXIST(500006, "意向信息不存在!", null), + INTENT_WHAT_NOT_EXIST(500016, "加盟问卷信息不存在!", null), INTENT_AREA_NOT_BING_ZONE(500007, "意向区域没有绑定战区 分配招商经理失败!", null), PUBLIC_LINE_NOT_OPERATE(500008, "公海线索不允许操作!", null), PARTNER_BASE_INFO_NOT_EXIST(500009, "加盟商信息不存在!", null), diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java index 4848dc42d..cfbaa77b9 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java @@ -119,11 +119,14 @@ public class JoinIntentionServiceImpl extends LineFlowService implements JoinInt @Override public PartnerBaseInfoVO getByLineId(Long lineId) { - MemberQuestionDO result = joinIntentionMapper.getByLineId(lineId); LineInfoDO byLineId = lineInfoDAO.getLineInfo(lineId); + MemberQuestionDO result = joinIntentionMapper.getByLineId(lineId); if (Objects.isNull(byLineId)) { - throw new ServiceException(LINE_ID_IS_NOT_EXIST); + throw new ServiceException(ErrorCodeEnum.LINE_ID_IS_NOT_EXIST); + } + if (Objects.isNull(result)){ + return null; } PartnerBaseInfoVO response = PartnerBaseInfoVO.from(result, byLineId); HyOpenAreaInfoDO openAreaInfoDO = openAreaInfoMapper.selectById(Long.valueOf(response.getAreaCode()));