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

update 电单车查询收费标准

Browse Source
This commit is contained in:
Lemon
2025-12-15 10:11:08 +08:00
parent 819785667e
commit 8d1011df28
2 changed files with 37 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBillingTemplateServiceImpl.java
View File

@@ -16,6 +16,7 @@ import com.jsowell.common.util.id.Seq;
import com.jsowell.pile.domain.*; import com.jsowell.pile.domain.*;
import com.jsowell.pile.dto.BillingTimeDTO; import com.jsowell.pile.dto.BillingTimeDTO;
import com.jsowell.pile.dto.CreateOrUpdateBillingTemplateDTO; import com.jsowell.pile.dto.CreateOrUpdateBillingTemplateDTO;
import com.jsowell.pile.dto.ImportBillingTemplateDTO;
import com.jsowell.pile.mapper.PileBillingTemplateMapper; import com.jsowell.pile.mapper.PileBillingTemplateMapper;
import com.jsowell.pile.service.MemberGroupService; import com.jsowell.pile.service.MemberGroupService;
import com.jsowell.pile.service.PileBillingTemplateService; import com.jsowell.pile.service.PileBillingTemplateService;
@@ -142,9 +143,9 @@ public class PileBillingTemplateServiceImpl implements PileBillingTemplateServic
List<String> templateCodes = pileBillingDetails.stream().map(PileBillingDetail::getTemplateCode).collect(Collectors.toList()); List<String> templateCodes = pileBillingDetails.stream().map(PileBillingDetail::getTemplateCode).collect(Collectors.toList());
pileBillingTemplateMapper.deletePileBillingDetailByTemplateCodes(templateCodes); pileBillingTemplateMapper.deletePileBillingDetailByTemplateCodes(templateCodes);
} }
for (Long id : ids) { for (Long id : ids) {
cleanCache(null , id); cleanCache(null, id);
} }
return pileBillingTemplateMapper.deletePileBillingTemplateByIds(ids); return pileBillingTemplateMapper.deletePileBillingTemplateByIds(ids);
} }
@@ -158,7 +159,7 @@ public class PileBillingTemplateServiceImpl implements PileBillingTemplateServic
@Override @Override
public int deletePileBillingTemplateById(Long id) { public int deletePileBillingTemplateById(Long id) {
// pileBillingTemplateMapper.deletePileBillingDetailByTemplateCode(id); // pileBillingTemplateMapper.deletePileBillingDetailByTemplateCode(id);
cleanCache(null , id); cleanCache(null, id);
return pileBillingTemplateMapper.deletePileBillingTemplateById(id); return pileBillingTemplateMapper.deletePileBillingTemplateById(id);
} }
@@ -222,7 +223,7 @@ public class PileBillingTemplateServiceImpl implements PileBillingTemplateServic
// 入库 // 入库
transactionService.doCreateBillingTemplate(build); transactionService.doCreateBillingTemplate(build);
cleanCache(dto.getStationId() , null); cleanCache(dto.getStationId(), null);
} }
@Override @Override
@@ -265,7 +266,7 @@ public class PileBillingTemplateServiceImpl implements PileBillingTemplateServic
// 入库 // 入库
transactionService.doUpdateBillingTemplate(build); transactionService.doUpdateBillingTemplate(build);
cleanCache(dto.getStationId() , Long.valueOf(dto.getBillingTemplateId())); cleanCache(dto.getStationId(), Long.valueOf(dto.getBillingTemplateId()));
} }
/** /**
@@ -401,7 +402,7 @@ public class PileBillingTemplateServiceImpl implements PileBillingTemplateServic
// 查询站点的集团会员计费模板 // 查询站点的集团会员计费模板
BillingTemplateVO preferentialBillingTemplate = this.queryPreferentialBillingTemplate(stationId); BillingTemplateVO preferentialBillingTemplate = this.queryPreferentialBillingTemplate(stationId);
if (Objects.nonNull(preferentialBillingTemplate) && Objects.nonNull(result) ) { if (Objects.nonNull(preferentialBillingTemplate) && Objects.nonNull(result)) {
List<BillingDetailVO> billingDetailList = preferentialBillingTemplate.getBillingDetailList(); List<BillingDetailVO> billingDetailList = preferentialBillingTemplate.getBillingDetailList();
for (BillingDetailVO detailVO : billingDetailList) { for (BillingDetailVO detailVO : billingDetailList) {
List<String> applyTimeList = detailVO.getApplyTime(); List<String> applyTimeList = detailVO.getApplyTime();
@@ -425,13 +426,12 @@ public class PileBillingTemplateServiceImpl implements PileBillingTemplateServic
} }
/** /**
* 通过站点id查询当前时间的收费详情 (用于查询电动单车的收费详情) * 通过站点id查询当前时间的收费详情 (用于查询电动单车的收费详情)
* *
* @param stationId 站点id * @param stationId 站点id
*/ */
@Override @Override
public CurrentTimePriceDetails getCurrentTimePriceDetailsForEBike(String stationId) { public CurrentTimePriceDetails getCurrentTimePriceDetailsForEBike(String stationId) {
CurrentTimePriceDetails result = null; CurrentTimePriceDetails result = null;
// 查询当前时段电费 // 查询当前时段电费
@@ -461,39 +461,41 @@ public class PileBillingTemplateServiceImpl implements PileBillingTemplateServic
} }
} }
} }
}
return result;
} }
/** /**
* 用于微信发送微信提醒,查询计费详情 * 用于微信发送微信提醒,查询计费详情
*
* @param stationId * @param stationId
* @param pileSn * @param pileSn
* @return * @return
*/ */
// @Override @Override
// public CurrentTimePriceDetails getCurrentTimePriceDetailsByPileType(String stationId , String pileSn) { public CurrentTimePriceDetails getCurrentTimePriceDetailsByPileType(String stationId, String pileSn) {
// // 使用工具类判断是否为电单车桩 return null;
// // boolean isEBike = YouDianUtils.isEBikePileSn(pileSn); // 使用工具类判断是否为电单车桩
// // 判断桩号是否为汽车桩号 // boolean isEBike = YouDianUtils.isEBikePileSn(pileSn);
// Boolean result = YKCUtils.checkEVPileSn(pileSn); // 判断桩号是否为汽车桩号
// // Boolean result = YKCUtils.checkEVPileSn(pileSn);
// if (result) { //
// log.info("走电动汽车逻辑"); // if (result) {
// // 电动汽车：调用电动汽车计费模板查询方法 // log.info("走电动汽车逻辑");
// return getCurrentTimePriceDetails(stationId); // // 电动汽车：调用电动汽车计费模板查询方法
// } else { // return getCurrentTimePriceDetails(stationId);
// log.info("走电单车方法"); // } else {
// // 电单车：调用电单车计费模板查询方法 // log.info("走电单车方法");
// return getCurrentTimePriceDetailsForEBike(stationId); // // 电单车：调用电单车计费模板查询方法
// } // return getCurrentTimePriceDetailsForEBike(stationId);
// }
} }
/** /**
* 通过计费模板id查询计费模板详情 * 通过计费模板id查询计费模板详情
* 缓存1天，修改清缓存 * 缓存1天，修改清缓存
*
* @param id * @param id
* @return * @return
*/ */
@@ -513,6 +515,7 @@ public class PileBillingTemplateServiceImpl implements PileBillingTemplateServic
/** /**
* 修改站点计费模板状态并下发最新模板 * 修改站点计费模板状态并下发最新模板
*
* @return * @return
*/ */
@Override @Override
@@ -586,6 +589,7 @@ public class PileBillingTemplateServiceImpl implements PileBillingTemplateServic
/** /**
* 根据站点id查询优惠计费模板 * 根据站点id查询优惠计费模板
*
* @param stationId * @param stationId
* @return * @return
*/ */
@@ -671,7 +675,7 @@ public class PileBillingTemplateServiceImpl implements PileBillingTemplateServic
*/ */
@Override @Override
public List<BillingTemplateVO> queryStationBillingTemplateListForUniApp(String stationId) { public List<BillingTemplateVO> queryStationBillingTemplateListForUniApp(String stationId) {
// 加缓存 // 加缓存
String redisKey = CacheConstants.QUERY_STATION_BILLING_TEMPLATE_LIST + stationId; String redisKey = CacheConstants.QUERY_STATION_BILLING_TEMPLATE_LIST + stationId;
List<BillingTemplateVO> voList = redisCache.getCacheList(redisKey); List<BillingTemplateVO> voList = redisCache.getCacheList(redisKey);
if (CollectionUtils.isEmpty(voList)) { if (CollectionUtils.isEmpty(voList)) {
@@ -720,6 +724,7 @@ public class PileBillingTemplateServiceImpl implements PileBillingTemplateServic
/** /**
* 转换参数 * 转换参数
*
* @param billingDetailList * @param billingDetailList
* @return * @return
*/ */
@@ -759,6 +764,7 @@ public class PileBillingTemplateServiceImpl implements PileBillingTemplateServic
/** /**
* 通过站点id查询计费模板列表 * 通过站点id查询计费模板列表
*
* @param stationId 站点id * @param stationId 站点id
* @return * @return
*/ */

1
jsowell-pile/src/main/java/com/jsowell/wxpay/service/WxAppletRemoteService.java
View File

@@ -250,6 +250,7 @@ public class WxAppletRemoteService {
return null; return null;
} }
String pileSn = orderBasicInfo.getPileSn(); String pileSn = orderBasicInfo.getPileSn();
// 判断桩类型是否为汽车桩号
Boolean result = YKCUtils.checkEVPileSn(pileSn); Boolean result = YKCUtils.checkEVPileSn(pileSn);
// 收费标准 // 收费标准