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

Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-08-23 11:50:48 +08:00
parent 4339a9be9a 791fee3e24
commit 21abba59d3
9 changed files with 63 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileStationInfoMapper.java
View File

@@ -81,4 +81,11 @@ public interface PileStationInfoMapper {
List<String> queryByStationDeptIds(@Param("stationDeptIds") List<String> stationDeptIds);
int updateAmapFlag(@Param("stationId") String stationId, @Param("amapFlag") String amapFlag);
/**
* 通过站点部门id 查询站点id
* @param deptId
* @return
*/
List<String> getIdsByDeptId(String deptId);
}

7
jsowell-pile/src/main/java/com/jsowell/pile/service/IPileStationInfoService.java
View File

@@ -98,4 +98,11 @@ public interface IPileStationInfoService {
String selectAdapayMemberId(String stationId);
int updateAmapFlag(String stationId, String amapFlag);
/**
* 通过站点部门id查询站点id
* @param deptId
* @return
*/
List<String> getIdsByDeptId(String deptId);
}

3
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
View File

@@ -372,6 +372,9 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
public OrderTotalDataVO getOrderTotalDataV2(QueryOrderDTO dto) {
// 确定查询的站点
List<String> stationIdList = Lists.newArrayList();
if (CollectionUtils.isNotEmpty(dto.getStationIdList())) {
stationIdList.addAll(dto.getStationIdList());
}
if (StringUtils.isNotBlank(dto.getStationId())) {
stationIdList.add(dto.getStationId());
}

9
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java
View File

@@ -277,7 +277,14 @@ public class PileConnectorInfoServiceImpl implements IPileConnectorInfoService {
// 查询枪口当前订单
for (PileConnectorInfoVO pileConnectorInfoVO : pileConnectorInfoList) {
String pileConnectorCode = pileConnectorInfoVO.getPileConnectorCode();
pileConnectorInfoVO.setConnectorQrCodeUrl(getPileConnectorQrCodeUrl(pileConnectorCode)); // 枪口号二维码
// 通过stationId查询充电站信息（缓存方法）
PileStationVO stationInfo = pileStationInfoService.getStationInfo(pileConnectorInfoVO.getStationId());
if (stationInfo != null && StringUtils.isNotBlank(stationInfo.getQrcodePrefix())) {
String connectorQrCodeUrl = stationInfo.getQrcodePrefix() + pileConnectorCode;
pileConnectorInfoVO.setConnectorQrCodeUrl(connectorQrCodeUrl);
}else {
pileConnectorInfoVO.setConnectorQrCodeUrl(getPileConnectorQrCodeUrl(pileConnectorCode)); // 枪口号二维码
}
OrderBasicInfo order = orderBasicInfoService.queryChargingByPileConnectorCode(pileConnectorCode);
if (order != null) {
pileConnectorInfoVO.setOrderCode(order.getOrderCode());

10
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java
View File

@@ -476,5 +476,15 @@ public class PileStationInfoServiceImpl implements IPileStationInfoService {
return pileStationInfoMapper.updateAmapFlag(stationId, amapFlag);
}
/**
* 通过站点部门id查询站点id
* @param deptId
* @return
*/
@Override
public List<String> getIdsByDeptId(String deptId) {
return pileStationInfoMapper.getIdsByDeptId(deptId);
}
}