From 2aa3a7eb4cb67b084385c743cf4068d37982d409 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Fri, 11 Oct 2024 10:00:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E5=BB=BA=E5=BA=97info?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cool/store/vo/PlatformBuildInfoVO.java | 12 ++++++++++++ .../store/service/impl/PlatformBuildServiceImpl.java | 7 +++++++ 2 files changed, 19 insertions(+) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/PlatformBuildInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/PlatformBuildInfoVO.java index f1c65742a..e43c71f7d 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/PlatformBuildInfoVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/PlatformBuildInfoVO.java @@ -36,6 +36,18 @@ public class PlatformBuildInfoVO { @ApiModelProperty("完成项") private Integer completionColumn; + @ApiModelProperty("省") + private String province; + + @ApiModelProperty("市") + private String city; + + @ApiModelProperty("区") + private String district; + + @ApiModelProperty("详细地址") + private String address; + @ApiModelProperty("所属区域") private String regionName; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PlatformBuildServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PlatformBuildServiceImpl.java index 31dacb66d..c305e1349 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PlatformBuildServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PlatformBuildServiceImpl.java @@ -71,6 +71,8 @@ public class PlatformBuildServiceImpl implements PlatformBuildService { private RegionService regionService; @Autowired private EnterpriseUserDAO enterpriseUserDAO; + @Autowired + private PointInfoDAO pointInfoDAO; @Override public String juridicalIdCard(Long shopId) { @@ -193,6 +195,7 @@ public class PlatformBuildServiceImpl implements PlatformBuildService { PlatformBuildInfoVO platformBuildInfoVO = new PlatformBuildInfoVO(); Map regionNameMap = regionService.getBelongWarRegionNameMap(Collections.singletonList(shopInfo.getRegionId())); String investmentManager = enterpriseUserDAO.getUserName(lineInfo.getInvestmentManager()); + PointInfoDO pointInfoDO = pointInfoDAO.getPointInfoById(shopInfo.getPointId()); platformBuildInfoVO.setShopId(shopId); platformBuildInfoVO.setUsername(lineInfo.getUsername()); platformBuildInfoVO.setMobile(lineInfo.getMobile()); @@ -200,6 +203,10 @@ public class PlatformBuildServiceImpl implements PlatformBuildService { platformBuildInfoVO.setShopName(shopInfo.getShopName()); platformBuildInfoVO.setShopCode(shopInfo.getShopCode()); platformBuildInfoVO.setRegionName(regionNameMap.get(shopInfo.getRegionId())); + platformBuildInfoVO.setProvince(pointInfoDO.getProvince()); + platformBuildInfoVO.setCity(pointInfoDO.getCity()); + platformBuildInfoVO.setDistrict(pointInfoDO.getDistrict()); + platformBuildInfoVO.setAddress(pointInfoDO.getAddress()); if (CollectionUtils.isNotEmpty(shopContractActualCompletionTime)) { ScheduleDTO scheduleDTO = shopContractActualCompletionTime.get(CommonConstants.ZERO); platformBuildInfoVO.setCompletionColumn(scheduleDTO.getCompletionColumn());