From 62ff276c623241fc7a4fa453bee32130acd43ffd Mon Sep 17 00:00:00 2001 From: guohb Date: Thu, 25 Apr 2024 16:18:38 +0800 Subject: [PATCH 1/2] getLineInfo --- .../main/java/com/cool/store/service/impl/LineServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java index cf87e3ce2..b783cd3cf 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java @@ -94,7 +94,7 @@ public class LineServiceImpl implements LineService { result.setInvestmentManagerName(user.getName()); result.setInvestmentManagerMobile(user.getMobile()); } - if(lineInfo.getRegionId()!=null){ + if(lineInfo.getRegionId() != null && lineInfo.getRegionId() != 0){ Long bigRegionIdByAreaId = regionService.getBigRegionIdByAreaId(lineInfo.getWantShopAreaId()); Map regionNameMap = regionDao.getRegionNameMap(Arrays.asList(bigRegionIdByAreaId, lineInfo.getRegionId())); result.setRegionId(lineInfo.getRegionId()); From ee3f76a0f0c2312641456165a8422c11db00a72d Mon Sep 17 00:00:00 2001 From: guohb Date: Thu, 25 Apr 2024 16:23:38 +0800 Subject: [PATCH 2/2] getLineInfo2 --- .../main/java/com/cool/store/service/impl/LineServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java index b783cd3cf..6af219718 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java @@ -85,6 +85,9 @@ public class LineServiceImpl implements LineService { if (lineInfo==null){ throw new ServiceException(ErrorCodeEnum.LINE_ID_IS_NOT_EXIST); } + if (StringUtil.isBlank(lineInfo.getInvestmentManager())){ + return null; + } if (lineInfo.getLineSource()!=null){ Map channelMapByIds = hyPartnerUserChannelDAO.getChannelMapByIds(Arrays.asList(lineInfo.getLineSource())); result.setLineSourceName(channelMapByIds.get(lineInfo.getLineSource()));