From 42768c6785f312b5e110222e6e3178f1aa415a68 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 17 十月 2024 14:13:59 +0800
Subject: [PATCH] 合并代码

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java |   12 ++++++------
 1 files changed, 6 insertions(+), 6 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 0d4c102..a4545e0 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
@@ -1894,10 +1894,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 +1935,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