From b31c93fb967a1b58ed8559b24f0046ad292ee73e Mon Sep 17 00:00:00 2001 From: zhangchenbiao Date: Wed, 8 May 2024 11:50:17 +0800 Subject: [PATCH] fix --- .../cool/store/vo/LinePointBaseInfoVO.java | 28 +++++++++++++++++++ .../com/cool/store/service/PointService.java | 8 ++++++ .../store/service/impl/PointServiceImpl.java | 16 +++++++++++ .../controller/webb/PointController.java | 6 ++++ 4 files changed, 58 insertions(+) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/LinePointBaseInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/LinePointBaseInfoVO.java index 31cb5755e..e584b6e77 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/LinePointBaseInfoVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/LinePointBaseInfoVO.java @@ -89,4 +89,32 @@ public class LinePointBaseInfoVO { return resultList; } + + public static LinePointBaseInfoVO convert(LineInfoDO lineInfo, String username, Map userPortraitMap, HyOpenAreaInfoDO cityArea, Map recommendShopNumMap, Map selectedShopNumMap){ + LinePointBaseInfoVO linePointBaseInfo = new LinePointBaseInfoVO(lineInfo.getId(), lineInfo.getUsername(), lineInfo.getMobile()); + linePointBaseInfo.setWantShopNum(lineInfo.getWantShopNum()); + linePointBaseInfo.setInvestmentManagerUsername(username); + if(Objects.nonNull(cityArea)){ + linePointBaseInfo.setAreaName(cityArea.getAreaName()); + linePointBaseInfo.setAreaPath(cityArea.getAreaPath().replace("/", "").trim()); + } + linePointBaseInfo.setRecommendShopNum(recommendShopNumMap.get(lineInfo.getId())); + linePointBaseInfo.setSelectedShopNum(selectedShopNumMap.get(lineInfo.getId())); + if(StringUtils.isNotBlank(lineInfo.getUserPortrait())){ + List userPortraitList = new ArrayList<>(); + String[] parts = lineInfo.getUserPortrait().split(","); + for (String part : parts) { + String trimmedPart = part.trim(); + if (StringUtils.isNotBlank(trimmedPart)) { + String s = userPortraitMap.get(Long.valueOf(part)); + if(StringUtils.isNotBlank(s)){ + userPortraitList.add(s); + } + } + } + linePointBaseInfo.setUserPortraitList(userPortraitList); + } + return linePointBaseInfo; + } + } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/PointService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/PointService.java index 7d3bed381..556fa5f91 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/PointService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/PointService.java @@ -124,6 +124,14 @@ public interface PointService { */ PageInfo getLinePage(PointLinePageRequest request); + + /** + * 获取单个加盟商信息 + * @param lineId + * @return + */ + LinePointBaseInfoVO getLineInfo(Long lineId); + /** * 获取我的数据 * @param userId diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java index c0fcb04a5..aeacbc51e 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java @@ -492,6 +492,22 @@ public class PointServiceImpl implements PointService { return resultPage; } + /** + * 获取单个加盟商信息 + * @param lineId + * @return + */ + @Override + public LinePointBaseInfoVO getLineInfo(Long lineId){ + LineInfoDO lineInfo = lineInfoDAO.getLineInfo(lineId); + Map recommendShopNumMap = pointRecommendDAO.getPushShopNumMap(Arrays.asList(lineId)); + HyOpenAreaInfoDO cityArea = hyOpenAreaInfoDAO.selectById(lineInfo.getWantShopAreaId()); + Map selectedShopNumMap = shopInfoDAO.getSelectedShopNumMap(Arrays.asList(lineId)); + String userName = enterpriseUserDAO.getUserName(lineInfo.getInvestmentManager()); + Map userPortraitMap = labelService.getUserPortraitMap(Arrays.asList(lineInfo.getUserPortrait())); + return LinePointBaseInfoVO.convert(lineInfo, userName, userPortraitMap, cityArea, recommendShopNumMap, selectedShopNumMap); + } + @Override public PointHomePageDataVO getMyPointData(String userId) { return pointInfoDAO.getMyPointData(userId); diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PointController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PointController.java index a3edca821..6733d870d 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PointController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PointController.java @@ -126,6 +126,12 @@ public class PointController { return ResponseResult.success(pointService.getLinePage(request)); } + @ApiOperation("获取我负责的加盟商列表") + @GetMapping("/getLineInfo") + public ResponseResult getLineInfo(@RequestParam("lineId") Long lineId) { + return ResponseResult.success(pointService.getLineInfo(lineId)); + } + @ApiOperation("首页我的数据") @GetMapping("/getMyData") public ResponseResult getMyPointData() {