From 992758ada9b24c209d6ac9d0b1e40cbcdc66a471 Mon Sep 17 00:00:00 2001 From: zhangchenbiao Date: Tue, 30 Apr 2024 16:38:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=A7=9F=E8=B5=81=E5=90=88?= =?UTF-8?q?=E5=90=8C=E6=8C=89=E9=92=AE=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cool/store/dao/ShopStageInfoDAO.java | 12 +++++++++++- .../com/cool/store/mapper/ShopStageInfoMapper.java | 7 +++++++ .../main/resources/mapper/ShopStageInfoMapper.xml | 11 +++++++++++ .../java/com/cool/store/vo/point/PointDetailVO.java | 3 +++ .../cool/store/vo/point/PointRecommendPageVO.java | 8 +++++++- .../cool/store/service/impl/PointServiceImpl.java | 9 ++++++++- .../cool/store/controller/webb/PCTestController.java | 2 +- 7 files changed, 48 insertions(+), 4 deletions(-) diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.java index 98136bf4e..f5ae3264c 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.java @@ -193,5 +193,15 @@ public class ShopStageInfoDAO { return shopStageInfoMapper.getShopContractActualCompletionTime(shopIdList); } - + /** + * 获取可以上传租赁合同的店铺id + * @param shopIds + * @return + */ + public List getCanSubmitRentContractShopIds(List shopIds) { + if(CollectionUtils.isEmpty(shopIds)){ + return Lists.newArrayList(); + } + return shopStageInfoMapper.getCanSubmitRentContractShopIds(shopIds); + } } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopStageInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopStageInfoMapper.java index 846fdb437..41bd9e087 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopStageInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopStageInfoMapper.java @@ -105,4 +105,11 @@ public interface ShopStageInfoMapper extends Mapper { List getScheduleList(@Param("shopIds") List shopIds); List getShopContractActualCompletionTime(@Param("shopIds") List shopIds); + + /** + * 获取可以上传租赁合同的店铺id + * @param shopIds + * @return + */ + List getCanSubmitRentContractShopIds(@Param("shopIds") List shopIds); } diff --git a/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml index c4d45eaa4..f3bf28bdb 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml @@ -182,5 +182,16 @@ + + \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/point/PointDetailVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/point/PointDetailVO.java index 9a34e0491..dbe4cffd1 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/point/PointDetailVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/point/PointDetailVO.java @@ -254,6 +254,9 @@ public class PointDetailVO { @ApiModelProperty("街道") private String township; + @ApiModelProperty("是否可以上传租赁合同") + private boolean canSubmitRentContract; + public static PointDetailVO convertVO(PointInfoDO pointInfo, PointDetailInfoDO pointDetailInfo) { PointDetailVO result = new PointDetailVO(); diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/point/PointRecommendPageVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/point/PointRecommendPageVO.java index a443bffe9..875dc1c9b 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/point/PointRecommendPageVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/point/PointRecommendPageVO.java @@ -57,8 +57,11 @@ public class PointRecommendPageVO { @ApiModelProperty("铺位地址") private String address; + @ApiModelProperty("是否可以上传租赁合同") + private boolean canSubmitRentContract; - public static List convertVO(List recommendList, List pointList, Map usernameMap, Map regionNameMap) { + + public static List convertVO(List recommendList, List pointList, Map usernameMap, Map regionNameMap, List canSubmitRentContractShopIds) { if(CollectionUtils.isEmpty(recommendList) || CollectionUtils.isEmpty(pointList)){ return Lists.newArrayList(); } @@ -83,6 +86,9 @@ public class PointRecommendPageVO { recommend.setDevelopmentManagerUsername(usernameMap.get(pointInfo.getDevelopmentManager())); recommend.setDevelopmentTime(pointInfo.getDevelopmentTime()); recommend.setAddress(pointInfo.getAddress()); + if(canSubmitRentContractShopIds.contains(pointInfo.getShopId())){ + recommend.setCanSubmitRentContract(Boolean.TRUE); + } } resultList.add(recommend); } 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 3edd62de5..4d7f0e5e5 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 @@ -120,6 +120,11 @@ public class PointServiceImpl implements PointService { if(Objects.nonNull(isGetNodeNo) && isGetNodeNo){ result.setCurNodeNo(pointTodoInfoDAO.getCurNodeNoByPoint(pointId)); } + if(SelectStatusEnum.SELECT_STATUS_1.getCode().equals(pointInfo.getSelectStatus())){ + List canSubmitRentContractShopIds = shopStageInfoDAO.getCanSubmitRentContractShopIds(Arrays.asList(pointInfo.getShopId())); + boolean canSubmitRentContract = CollectionUtils.isEmpty(canSubmitRentContractShopIds) ? Boolean.FALSE : Boolean.TRUE; + result.setCanSubmitRentContract(canSubmitRentContract); + } return result; } @@ -552,9 +557,11 @@ public class PointServiceImpl implements PointService { List pointList = pointInfoDAO.getPointListByIds(pointIds); List regionIds = pointList.stream().map(PointInfoDO::getRegionId).distinct().collect(Collectors.toList()); List developmentManagers = pointList.stream().map(PointInfoDO::getDevelopmentManager).distinct().collect(Collectors.toList()); + List shopIds = pointList.stream().map(PointInfoDO::getShopId).distinct().collect(Collectors.toList()); + List canSubmitRentContractShopIds = shopStageInfoDAO.getCanSubmitRentContractShopIds(shopIds); Map userNameMap = enterpriseUserDAO.getUserNameMap(developmentManagers); Map regionNameMap = regionService.getBelongWarRegionNameMap(regionIds); - return PointRecommendPageVO.convertVO(recommendPointList, pointList, userNameMap, regionNameMap); + return PointRecommendPageVO.convertVO(recommendPointList, pointList, userNameMap, regionNameMap, canSubmitRentContractShopIds); } @Override diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java index aef183828..3907bf76f 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java @@ -44,7 +44,7 @@ public class PCTestController { public ResponseResult sendSms(){ JSONObject templateParam = new JSONObject(); templateParam.put("pointName", "杭州市西湖区"); - commonService.sendSms("17681878615", SMSMsgEnum.RENT_CONTRACT_AUDIT_FAIL, null); + commonService.sendSms("17681878615", SMSMsgEnum.RENT_CONTRACT_AUDIT_FAIL, Arrays.asList(templateParam)); return ResponseResult.success(Boolean.FALSE); }