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

Merge remote-tracking branch 'origin/cc_partner_init' into cc_partner_init

Browse Source
This commit is contained in:
zhangchenbiao
2024-04-10 16:05:18 +08:00
parent e59da5aa86 46429a6b2a
commit 2a4053674d
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
View File

@@ -64,6 +64,7 @@ public enum ErrorCodeEnum {
ZONE_NOT_EXIST(500004, "战区不存在！", null), ZONE_NOT_EXIST(500004, "战区不存在！", null),
PARTNER_BASEINFO_NOT_EXIST(500005, "基本信息不存在！", null), PARTNER_BASEINFO_NOT_EXIST(500005, "基本信息不存在！", null),
INTENT_INFO_NOT_EXIST(500006, "意向信息不存在！", null), INTENT_INFO_NOT_EXIST(500006, "意向信息不存在！", null),
INTENT_WHAT_NOT_EXIST(500016, "加盟问卷信息不存在！", null),
INTENT_AREA_NOT_BING_ZONE(500007, "意向区域没有绑定战区 分配招商经理失败！", null), INTENT_AREA_NOT_BING_ZONE(500007, "意向区域没有绑定战区 分配招商经理失败！", null),
PUBLIC_LINE_NOT_OPERATE(500008, "公海线索不允许操作！", null), PUBLIC_LINE_NOT_OPERATE(500008, "公海线索不允许操作！", null),
PARTNER_BASE_INFO_NOT_EXIST(500009, "加盟商信息不存在！", null), PARTNER_BASE_INFO_NOT_EXIST(500009, "加盟商信息不存在！", null),

9
coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java
View File

@@ -119,11 +119,14 @@ public class JoinIntentionServiceImpl extends LineFlowService implements JoinInt
@Override @Override
public PartnerBaseInfoVO getByLineId(Long lineId) { public PartnerBaseInfoVO getByLineId(Long lineId) {
MemberQuestionDO result = joinIntentionMapper.getByLineId(lineId);
LineInfoDO byLineId = lineInfoDAO.getLineInfo(lineId); LineInfoDO byLineId = lineInfoDAO.getLineInfo(lineId);
MemberQuestionDO result = joinIntentionMapper.getByLineId(lineId);
if (Objects.isNull(result)) { 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 new PartnerBaseInfoVO();
} }
PartnerBaseInfoVO response = PartnerBaseInfoVO.from(result, byLineId); PartnerBaseInfoVO response = PartnerBaseInfoVO.from(result, byLineId);
HyOpenAreaInfoDO openAreaInfoDO = openAreaInfoMapper.selectById(Long.valueOf(response.getAreaCode())); HyOpenAreaInfoDO openAreaInfoDO = openAreaInfoMapper.selectById(Long.valueOf(response.getAreaCode()));