diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/PileController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/PileController.java index 706f1854e..b0139f7ee 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/PileController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/PileController.java @@ -84,6 +84,8 @@ public class PileController extends BaseController { List deptIds = pileMerchantInfoService.getDeptIdsByAppId(appId); queryStationDTO.setMerchantDeptIds(deptIds); } + // 获取memberId + queryStationDTO.setMemberId(getMemberIdByAuthorization(request)); logger.debug("uniApp查询充电站信息appId:{}, dto:{}", appId, JSON.toJSONString(queryStationDTO)); PageResponse pageResponse = pileStationInfoService.uniAppQueryStationInfoList(queryStationDTO); response = new RestApiResponse<>(pageResponse); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java index 9e83531e0..f737f2a48 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java @@ -526,6 +526,9 @@ public class PileStationInfoServiceImpl implements PileStationInfoService { // 根据前台参数分页 PageHelper.startPage(pageNum, pageSize); List list = pileStationInfoMapper.queryStationInfos(dto); + // 查询该站点是否是该会员收藏的站点 + List collectedStationIds = memberStationRelationService.getStationIdListByMemberId(dto.getMemberId()); + PageInfo pageInfo = new PageInfo<>(list); List stationVOList = Lists.newArrayList(); @@ -588,6 +591,13 @@ public class PileStationInfoServiceImpl implements PileStationInfoService { stationVO.setVipTotalPrice(currentTimePriceDetails.getVipTotalPrice()); } stationVOList.add(stationVO); + + if (collectedStationIds.contains(stationVO.getStationId())) { + // 如果收藏的列表中有该站点的id,则返回 true + stationVO.setCollectedFlag(Boolean.TRUE); + }else { + stationVO.setCollectedFlag(Boolean.FALSE); + } } if (distance != 0.00) { diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/base/StationInfoVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/base/StationInfoVO.java index a578528ee..eace4ffa5 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/base/StationInfoVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/base/StationInfoVO.java @@ -128,6 +128,11 @@ public class StationInfoVO { */ private String stationLat; + /** + * 是否已收藏该站点 + */ + private boolean collectedFlag; + @Override public boolean equals(Object o) { if (this == o) return true;