From ca6fade1a01de3b64a12d998a791cec1b2b8fe1a Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 18 十月 2024 10:34:46 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 deletions(-)
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 23bc3eb..5d5ba67 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
@@ -70,10 +70,7 @@
import java.math.MathContext;
import java.math.RoundingMode;
import java.text.SimpleDateFormat;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.time.ZoneOffset;
+import java.time.*;
import java.time.format.DateTimeFormatter;
import java.time.format.TextStyle;
import java.time.temporal.WeekFields;
@@ -992,7 +989,12 @@
GetPlatformStopChargingReply query = new GetPlatformStopChargingReply();
query.setCharging_gun_code(chargingGun.getCode());
query.setCharging_pile_code(chargingPile.getCode());
- query.setEnd_time(chargingOrder.getEndTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+
+ //将时间转换成UTC时间后查询数据（mongodb存储时间以UTC格式存储）
+ ZoneId zoneId = ZoneId.systemDefault();
+ ZonedDateTime zonedDateTime = ZonedDateTime.of(chargingOrder.getEndTime(), zoneId);
+ ZonedDateTime endTime = zonedDateTime.withZoneSameInstant(ZoneId.of("UTC"));
+ query.setEnd_time(endTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
PlatformStopChargingReply reply = platformStopChargingReplyClient.getPlatformStopChargingReply(query).getData();
log.error(code1 + "：-------------------查询远程停止充电应答-------------------");
if(null == reply){
@@ -1407,6 +1409,7 @@
PageInfo<ChargingOrderListVO> pageInfo = new PageInfo<>(dto.getPageCurr(),dto.getPageSize());
List<ChargingOrderListVO> list = this.baseMapper.chargingList(pageInfo,dto,startTime1,startTime2,endTime1,endTime2);
for (ChargingOrderListVO chargingOrderListVO : list) {
+ chargingOrderListVO.setPaymentAmount(chargingOrderListVO.getResidualAmount()==null?chargingOrderListVO.getPaymentAmount():chargingOrderListVO.getPaymentAmount().subtract(chargingOrderListVO.getResidualAmount()));
chargingOrderListVO.setUid(chargingOrderListVO.getId()+"");
List<Integer> integers = new ArrayList<>();
integers.add(chargingOrderListVO.getSiteId());
@@ -1450,7 +1453,7 @@
if (data4!=null && !data4.isEmpty()) chargingOrderListVO.setLicensePlate(data4.get(0).getLicensePlate());
}
}
- if (data3 != null) chargingOrderListVO.setPhone(data3.getPhone());
+ chargingOrderListVO.setPhone(data3.getPhone());
}
}
@@ -1898,10 +1901,10 @@
order.setStartTime(LocalDateTime.parse(vo.getStart_time(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SS")));
order.setEndTime(LocalDateTime.parse(vo.getEnd_time(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SS")));
order.setStatus(5);
- order.setOrderAmount(orderAmount);
- order.setVipDiscountAmount(discountAmount);
- order.setServiceCharge(periodServicePrice_total);
- order.setElectrovalence(periodElectricPrice_total);
+ order.setOrderAmount(orderAmount.setScale(2, RoundingMode.DOWN));
+ order.setVipDiscountAmount(discountAmount.setScale(2, RoundingMode.DOWN));
+ order.setServiceCharge(periodServicePrice_total.setScale(2, RoundingMode.DOWN));
+ order.setElectrovalence(periodElectricPrice_total.setScale(2, RoundingMode.DOWN));
order.setChargingCapacity(vo.getTotal_electricity());
//计算优惠券
@@ -1939,8 +1942,8 @@
}
}
}
- order.setPaymentAmount(payAmount);
- order.setRefundAmount(refundAmount);
+ order.setPaymentAmount(payAmount.setScale(2, RoundingMode.DOWN));
+ order.setRefundAmount(refundAmount.setScale(2, RoundingMode.DOWN));
order.setRefundStatus(1);
this.updateById(order);
chargingOrder = this.getById(order.getId());
--
Gitblit v1.7.1