Merge branch 'dev-zza' into dev

This commit is contained in:
Lemon
2025-03-25 13:26:20 +08:00
5 changed files with 34 additions and 10 deletions

View File

@@ -526,6 +526,9 @@ public class PileStationInfoServiceImpl implements PileStationInfoService {
// 根据前台参数分页
PageHelper.startPage(pageNum, pageSize);
List<PileStationVO> list = pileStationInfoMapper.queryStationInfos(dto);
// 查询该站点是否是该会员收藏的站点
List<String> collectedStationIds = memberStationRelationService.getStationIdListByMemberId(dto.getMemberId());
PageInfo<PileStationVO> pageInfo = new PageInfo<>(list);
List<StationInfoVO> 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) {