mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-04-20 11:05:18 +08:00
update 高德
This commit is contained in:
@@ -135,6 +135,13 @@ public interface PileBillingTemplateMapper {
|
||||
*/
|
||||
BillingTemplateVO selectBillingTemplateByStationId(@Param("stationId") String stationId);
|
||||
|
||||
/**
|
||||
* 批量查询站点正在使用的计费模板信息
|
||||
* @param stationIdList 站点id集合
|
||||
* @return
|
||||
*/
|
||||
List<BillingTemplateVO> selectBillingTemplateByStationIdList(@Param("stationIdList") List<String> stationIdList);
|
||||
|
||||
/**
|
||||
* 通过模板id数组批量查询计费模板详情列表
|
||||
*/
|
||||
|
||||
@@ -7,6 +7,7 @@ import com.jsowell.pile.dto.CreateOrUpdateBillingTemplateDTO;
|
||||
import com.jsowell.pile.dto.ImportBillingTemplateDTO;
|
||||
import com.jsowell.pile.vo.uniapp.BillingPriceVO;
|
||||
import com.jsowell.pile.vo.uniapp.CurrentTimePriceDetails;
|
||||
import com.jsowell.pile.vo.web.BillingDetailVO;
|
||||
import com.jsowell.pile.vo.web.BillingTemplateVO;
|
||||
import com.jsowell.pile.vo.web.EchoBillingTemplateVO;
|
||||
|
||||
@@ -105,6 +106,8 @@ public interface IPileBillingTemplateService {
|
||||
*/
|
||||
BillingTemplateVO queryUsedBillingTemplate(String stationId);
|
||||
|
||||
List<BillingPriceVO> conversionParameters(List<BillingDetailVO> billingDetailList);
|
||||
|
||||
/**
|
||||
* 查询计费价格详情
|
||||
* @param stationId 站点id
|
||||
@@ -160,4 +163,7 @@ public interface IPileBillingTemplateService {
|
||||
CurrentTimePriceDetails getCurrentTimePriceDetails(String stationId);
|
||||
|
||||
List<PileBillingDetail> queryBillingDetailById(Long id);
|
||||
|
||||
// 批量查询站点计费模板
|
||||
List<BillingTemplateVO> selectBillingTemplateByStationIdList(List<String> stationIdList);
|
||||
}
|
||||
|
||||
@@ -379,6 +379,14 @@ public class PileBillingTemplateServiceImpl implements IPileBillingTemplateServi
|
||||
return pileBillingDetails;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<BillingTemplateVO> selectBillingTemplateByStationIdList(List<String> stationIdList) {
|
||||
if (CollectionUtils.isEmpty(stationIdList)) {
|
||||
return Lists.newArrayList();
|
||||
}
|
||||
return pileBillingTemplateMapper.selectBillingTemplateByStationIdList(stationIdList);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<BillingTemplateVO> queryPublicBillingTemplateList() {
|
||||
return pileBillingTemplateMapper.queryPublicBillingTemplateList();
|
||||
@@ -455,6 +463,45 @@ public class PileBillingTemplateServiceImpl implements IPileBillingTemplateServi
|
||||
return max.orElse(null);
|
||||
}
|
||||
|
||||
/**
|
||||
* 转换参数
|
||||
* @param billingDetailList
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public List<BillingPriceVO> conversionParameters(List<BillingDetailVO> billingDetailList) {
|
||||
List<BillingPriceVO> resultList = Lists.newArrayList();
|
||||
if (org.springframework.util.CollectionUtils.isEmpty(billingDetailList)) {
|
||||
return resultList;
|
||||
}
|
||||
for (BillingDetailVO billingDetailVO : billingDetailList) {
|
||||
List<String> applyTimeList = billingDetailVO.getApplyTime();
|
||||
BigDecimal electricityPrice = billingDetailVO.getElectricityPrice();
|
||||
BigDecimal servicePrice = billingDetailVO.getServicePrice();
|
||||
for (String applyTime : applyTimeList) {
|
||||
String[] split = applyTime.split("-");
|
||||
// 开始时间
|
||||
String startTime = split[0];
|
||||
// 结束时间
|
||||
String endTime = split[1];
|
||||
// 是否当前时间
|
||||
boolean in = DateUtils.isIn(LocalTime.now(), LocalTime.parse(startTime), LocalTime.parse(endTime));
|
||||
resultList.add(
|
||||
BillingPriceVO.builder()
|
||||
.timeType(billingDetailVO.getTimeType())
|
||||
.startTime(startTime)
|
||||
.endTime(endTime)
|
||||
.electricityPrice(electricityPrice.toString())
|
||||
.servicePrice(servicePrice.toString())
|
||||
.totalPrice(electricityPrice.add(servicePrice).toString())
|
||||
.isCurrentTime(in ? Constants.ONE : Constants.ZERO)
|
||||
.build()
|
||||
);
|
||||
}
|
||||
}
|
||||
return resultList;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<BillingPriceVO> queryBillingPrice(String stationId) {
|
||||
// 查询站点当前计费模板 有缓存
|
||||
|
||||
@@ -19,6 +19,9 @@ import java.util.Map;
|
||||
@AllArgsConstructor
|
||||
@Builder
|
||||
public class BillingTemplateVO {
|
||||
// 站点id
|
||||
private String stationId;
|
||||
|
||||
// 计费模板id
|
||||
private String templateId;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user