autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-06-21 07:39:55 +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-09-11 16:43:34 +08:00
parent 054b0e9e7d 52aba7f812
commit 84ad3c900d
3 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -279,6 +279,9 @@ public class PileStationInfoServiceImpl implements IPileStationInfoService {
String redisKey = CacheConstants.SELECT_PILE_STATION_INFO_BY_ID + pileStationInfo.getId(); String redisKey = CacheConstants.SELECT_PILE_STATION_INFO_BY_ID + pileStationInfo.getId();
redisCache.deleteObject(redisKey); redisCache.deleteObject(redisKey);
String templateRedisKey = CacheConstants.QUERY_STATION_BILLING_TEMPLATE_LIST + pileStationInfo.getId();
redisCache.deleteObject(templateRedisKey);
// 先查询一下当前数据库的充电站数据 // 先查询一下当前数据库的充电站数据
PileStationInfo queryStationInfo = selectPileStationInfoById(pileStationInfo.getId()); PileStationInfo queryStationInfo = selectPileStationInfoById(pileStationInfo.getId());
String oldMerchantId = String.valueOf(queryStationInfo.getMerchantId()); String oldMerchantId = String.valueOf(queryStationInfo.getMerchantId());

3
jsowell-pile/src/main/java/com/jsowell/pile/vo/web/BillingTemplateVO.java
View File

@@ -49,6 +49,9 @@ public class BillingTemplateVO {
// 占桩费率（单位：元/分钟） // 占桩费率（单位：元/分钟）
private BigDecimal occupyFee; private BigDecimal occupyFee;
// 停车免费描述
private String parkFeeDescribe;
// 尖时段电费 // 尖时段电费
private BigDecimal sharpElectricityPrice; private BigDecimal sharpElectricityPrice;
// 尖时段服务费 // 尖时段服务费

1
jsowell-pile/src/main/resources/mapper/pile/PileBillingTemplateMapper.xml
View File

@@ -501,6 +501,7 @@
t2.type as deviceType, t2.type as deviceType,
t2.free_time as freeTime, t2.free_time as freeTime,
t2.occupy_fee as occupyFee, t2.occupy_fee as occupyFee,
t1.park_fee_describe as parkFeeDescribe,
t2.publish_time as publishTime, t2.publish_time as publishTime,
t3.electricity_price AS sharpElectricityPrice, t3.electricity_price AS sharpElectricityPrice,
t3.service_price AS sharpServicePrice, t3.service_price AS sharpServicePrice,