From 945c12ccd5b4b72a8a4a5a9153a5901ffe587a10 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 28 十月 2024 18:49:32 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java | 12 ++++++------
ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TParkingRecord.java | 7 ++++---
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/server/ParkingOrderService.java | 2 ++
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java | 12 +++---------
4 files changed, 15 insertions(+), 18 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TParkingRecord.java b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TParkingRecord.java
index 3e5d867..6a147e5 100644
--- a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TParkingRecord.java
+++ b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TParkingRecord.java
@@ -36,13 +36,14 @@
@ApiModelProperty(value = "用户id")
@TableField("app_user_id")
private Long appUserId;
+
+ @ApiModelProperty(value = "停车场名称")
+ @TableField("name")
+ private String name;
@ApiModelProperty(value = "车牌号")
@TableField("license_plate")
private String licensePlate;
-
- @TableField(exist = false)
- private String name;
@TableField(exist = false)
private String uid;
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java
index 0b3567e..8081c4e 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java
@@ -123,21 +123,15 @@
SiteInfoVO siteInfoVO = new SiteInfoVO();
TChargingGun chargingGun = chargingGunService.getOne(new LambdaQueryWrapper<TChargingGun>().eq(TChargingGun::getFullNumber, number));
TChargingPile one = chargingPileService.getById(chargingGun.getChargingPileId());
- Site byId = siteService.getById(one.getSiteId());
- TAccountingStrategy byId1 = accountingStrategyService.getById(byId.getAccountingStrategyId());
+ Site byId = siteService.getById(chargingGun.getSiteId());
+ TAccountingStrategy byId1 = accountingStrategyService.getById(chargingGun.getAccountingStrategyId());
List<TAccountingStrategyDetail> list = accountingStrategyDetailService.lambdaQuery().eq(TAccountingStrategyDetail::getAccountingStrategyId, byId1.getId()).list();
list.stream().filter(item -> "00:00".equals(item.getEndTime())).forEach(item -> item.setEndTime("23:59:59"));
- Long userId = tokenService.getLoginUserApplet().getUserId();
- TAppUser appUser = appUserClient.getUserById(userId).getData();
for (TAccountingStrategyDetail tAccountingStrategyDetail : list) {
// 当前时间属于那个阶段 取哪个阶段的电价
if(DateUtils.string2LocalTime(tAccountingStrategyDetail.getStartTime() + ":00").compareTo(LocalTime.now()) <= 0
&& DateUtils.string2LocalTime(tAccountingStrategyDetail.getEndTime() + ("23:59:59".equals(tAccountingStrategyDetail.getEndTime())?"":":00")).compareTo(LocalTime.now()) > 0){
- if(null != appUser.getVipId()){
- siteInfoVO.setVipElectrovalence(tAccountingStrategyDetail.getElectrovalence().setScale(4, BigDecimal.ROUND_HALF_UP));
- }else{
-
- }
+ siteInfoVO.setVipElectrovalence(tAccountingStrategyDetail.getElectrovalence().setScale(4, BigDecimal.ROUND_HALF_UP));
siteInfoVO.setElectrovalence(tAccountingStrategyDetail.getElectrovalence().setScale(4, BigDecimal.ROUND_HALF_UP));
}
}
diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/server/ParkingOrderService.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/server/ParkingOrderService.java
index f3ece3c..1a3c63c 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/server/ParkingOrderService.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/server/ParkingOrderService.java
@@ -51,6 +51,7 @@
parkingRecord.setCode(code);
parkingRecord.setVehicleColor(order.getPlateColor());
TParkingLot data = parkingLotClient.getParkingLotByAppKey(order.getAppkey()).getData();
+ parkingRecord.setName(data.getName());
parkingRecord.setParkingLotId(data.getId());
parkingRecord.setInParkingTime(LocalDateTime.parse(order.getEnterDateTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
parkingRecord.setStatus(1);
@@ -101,6 +102,7 @@
parkingRecord.setCode(code);
parkingRecord.setVehicleColor(order.getPlatecolor());
TParkingLot data = parkingLotClient.getParkingLotByAppKey(order.getAppkey()).getData();
+ parkingRecord.setName(data.getName());
parkingRecord.setParkingLotId(data.getId());
parkingRecord.setInParkingTime(LocalDateTime.parse(order.getEntertime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
parkingRecord.setStatus(1);
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
index 494f449..dba79d4 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
@@ -1821,7 +1821,7 @@
BeanUtils.copyProperties(strategyDetail, vo1);
vo1.setStart(sdfs.parse(vo.getStart_time().split(" ")[0] + " " + strategyDetail.getStartTime() + ":00").getTime());
vo1.setEnd(sdfs.parse(vo.getStart_time().split(" ")[0] + " " + strategyDetail.getEndTime() + ":00").getTime());
- vo1.setServiceCharge(sharp_peak_charge);
+ vo1.setChargingCapacity(sharp_peak_charge);
lists.add(vo1);
} catch (IllegalAccessException e) {
throw new RuntimeException(e);
@@ -1864,10 +1864,10 @@
} catch (ParseException e) {
throw new RuntimeException(e);
}
+ System.err.println(start.getTime() + "\n" + end.getTime() + "\n" + lists.get(0).getStart() + "\n" + lists.get(0).getEnd());
+
+
for (AccountingStrategyDetailOrderVo strategyDetail : lists) {
- if(strategyDetail.getStart() < start.getTime() || strategyDetail.getEnd() > end.getTime()){
- continue;
- }
BigDecimal sharp_peak_charge = strategyDetail.getChargingCapacity();
TChargingOrderAccountingStrategy chargingOrderAccountingStrategy = new TChargingOrderAccountingStrategy();
chargingOrderAccountingStrategy.setChargingOrderId(chargingOrder.getId());
@@ -1883,9 +1883,9 @@
chargingOrderAccountingStrategy.setStartTime(strategyDetail.getStartTime());
}
if(end.getTime() >= strategyDetail.getEnd()){
- chargingOrderAccountingStrategy.setStartTime(strategyDetail.getEndTime());
+ chargingOrderAccountingStrategy.setEndTime(strategyDetail.getEndTime());
}else{
- chargingOrderAccountingStrategy.setStartTime(sdf2.format(end));
+ chargingOrderAccountingStrategy.setEndTime(sdf2.format(end));
}
//已充电总度数
--
Gitblit v1.7.1