autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-20 02:55:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev-zza' into dev

Browse Source
This commit is contained in:
Lemon
2025-03-25 13:26:20 +08:00
parent 72604e8713 d6e4131adf
commit 784c741983
5 changed files with 34 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/PileController.java
View File

@@ -84,6 +84,8 @@ public class PileController extends BaseController {
List<String> 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);

17
jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryStationDTO.java
View File

@@ -127,10 +127,19 @@ public class QueryStationDTO extends BaseEntity {
private String memberId;
/**
* 是否有雨棚
*/
private String canopyFlag;
/**
* 是否有道闸
*/
private String barrierFlag;
/**
* 是否有地锁
*/
private String parkingLockFlag;
@Data
@@ -150,14 +159,6 @@ public class QueryStationDTO extends BaseEntity {
*/
private List<String> pilePower;
/**
* 站点服务
* 1 - 雨棚
* 2 - 休息室
* 3 - 卫生间
*/
private List<String> stationService;
/**
* 我的收藏
*/

10
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java
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) {

5
jsowell-pile/src/main/java/com/jsowell/pile/vo/base/StationInfoVO.java
View File

@@ -128,6 +128,11 @@ public class StationInfoVO {
*/
private String stationLat;
/**
* 是否已收藏该站点
*/
private boolean collectedFlag;
@Override
public boolean equals(Object o) {
if (this == o) return true;

10
jsowell-pile/src/main/resources/mapper/pile/PileStationInfoMapper.xml
View File

@@ -370,8 +370,14 @@
<if test="stationDTO.address != null and stationDTO.address != ''">
and t1.address like concat('%', #{stationDTO.address,jdbcType=VARCHAR}, '%')
</if>
<if test="stationDTO.stationTel != null and stationDTO.stationTel != ''">
and t1.station_tel = #{stationDTO.stationTel,jdbcType=VARCHAR}
<if test="stationDTO.canopyFlag != null and stationDTO.canopyFlag != ''">
and t1.canopy_flag = #{stationDTO.canopyFlag,jdbcType=VARCHAR}
</if>
<if test="stationDTO.barrierFlag != null and stationDTO.barrierFlag != ''">
and t1.barrier_flag = #{stationDTO.barrierFlag,jdbcType=VARCHAR}
</if>
<if test="stationDTO.parkingLockFlag != null and stationDTO.parkingLockFlag != ''">
and t1.parking_lock_flag = #{stationDTO.parkingLockFlag,jdbcType=VARCHAR}
</if>
<!-- 数据范围过滤 -->
<if test="stationDTO.merchantDeptIds != null and stationDTO.merchantDeptIds.size() != 0">