From cd325f0b6e1ede0a350bd9182d19796864b74545 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 17 十月 2024 14:15:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 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 e1de59e..4d33e67 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
@@ -1772,13 +1772,17 @@
//获取订单的计费策略
List<AccountingStrategyDetailOrder> accountingStrategyDetailOrderList = accountingStrategyDetailOrderClient.getAllAccountingStrategyDetailOrder(chargingOrder.getId()).getData();
+ AccountingStrategyDetailOrder accountingStrategyDetailOrder = accountingStrategyDetailOrderList.get(accountingStrategyDetailOrderList.size() - 1);
+ if(accountingStrategyDetailOrder.getEndTime().equals("00:00")){
+ accountingStrategyDetailOrder.setEndTime("24:00");
+ }
chargingOrderAccountingStrategyService.remove(new LambdaQueryWrapper<TChargingOrderAccountingStrategy>().eq(TChargingOrderAccountingStrategy::getChargingOrderId, chargingOrder.getId()));
for (int i = 0; i < 12; i++) {
Class<? extends TransactionRecordMessageVO> clazz = vo.getClass();
try {
- String time = (String) clazz.getMethod("getTime" + (i + 1)).invoke(vo);
- if(StringUtils.hasLength(time)){
- String[] split = time.split("-");
+ Object invoke1 = clazz.getMethod("getTime" + (i + 1)).invoke(vo);
+ if(null != invoke1){
+ String[] split = invoke1.toString().split("-");
AccountingStrategyDetailOrder strategyDetail = accountingStrategyDetailOrderList.stream().filter(s -> s.getStartTime().equals(split[0]) && s.getEndTime().equals(split[1])).findFirst().get();
//阶段（1=尖阶段，2=峰阶段，3=平阶段，4=谷阶段）
Object invoke = null;
@@ -1894,10 +1898,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());
//计算优惠券
@@ -1935,8 +1939,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