From 8e345b113076cbc95de157ac2e7442ad7d2a2cde Mon Sep 17 00:00:00 2001
From: Guoqs <123@jsowell.com>
Date: Fri, 15 Nov 2024 13:11:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=B9=B6=E5=85=85=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E6=95=B0=E6=8D=AE=E5=B7=A5=E5=85=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jsowell/service/TempService.java     | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/jsowell-admin/src/main/java/com/jsowell/service/TempService.java b/jsowell-admin/src/main/java/com/jsowell/service/TempService.java
index 1c5287766..8ef31a78e 100644
--- a/jsowell-admin/src/main/java/com/jsowell/service/TempService.java
+++ b/jsowell-admin/src/main/java/com/jsowell/service/TempService.java
@@ -18,6 +18,7 @@ import com.jsowell.common.core.redis.RedisCache;
 import com.jsowell.common.enums.adapay.AdapayStatusEnum;
 import com.jsowell.common.enums.ykc.*;
 import com.jsowell.common.exception.BusinessException;
+import com.jsowell.common.util.DateUtils;
 import com.jsowell.common.util.StringUtils;
 import com.jsowell.pile.domain.*;
 import com.jsowell.pile.dto.ApplyRefundDTO;
@@ -652,6 +653,7 @@ public class TempService {
         for (OrderBasicInfo orderBasicInfo : orderBasicInfos) {
             orderBasicInfo.setOrderAmount(orderBasicInfo.getOrderAmount().multiply(multiple));
             orderBasicInfo.setVirtualAmount(orderBasicInfo.getVirtualAmount().multiply(multiple));
+            orderBasicInfo.setUpdateTime(DateUtils.getNowDate());
         }
         // 查询订单详情数据
         List<OrderDetail> orderDetailList = orderBasicInfoService.getOrderDetailList(orderCodeList);
@@ -667,23 +669,28 @@ public class TempService {
             // 尖时段
             if (orderDetail.getSharpUsedElectricity() != null && orderDetail.getSharpUsedElectricity().compareTo(BigDecimal.ZERO) > 0) {
                 orderDetail.setSharpUsedElectricity(orderDetail.getSharpUsedElectricity().multiply(multiple));
-                orderDetail.setSharpAmount(orderDetail.getSharpAmount().multiply(multiple));
+                // orderDetail.setSharpAmount(orderDetail.getSharpAmount().multiply(multiple));
+                orderDetail.setSharpAmount(orderDetail.getSharpPrice().multiply(orderDetail.getSharpUsedElectricity()));
             }
             // 峰时段
             if (orderDetail.getPeakUsedElectricity() != null && orderDetail.getPeakUsedElectricity().compareTo(BigDecimal.ZERO) > 0) {
                 orderDetail.setPeakUsedElectricity(orderDetail.getPeakUsedElectricity().multiply(multiple));
-                orderDetail.setPeakAmount(orderDetail.getPeakAmount().multiply(multiple));
+                // orderDetail.setPeakAmount(orderDetail.getPeakAmount().multiply(multiple));
+                orderDetail.setPeakAmount(orderDetail.getPeakPrice().multiply(orderDetail.getPeakUsedElectricity()));
             }
             // 平时段
             if (orderDetail.getFlatUsedElectricity() != null && orderDetail.getFlatUsedElectricity().compareTo(BigDecimal.ZERO) > 0) {
                 orderDetail.setFlatUsedElectricity(orderDetail.getFlatUsedElectricity().multiply(multiple));
-                orderDetail.setFlatAmount(orderDetail.getFlatAmount().multiply(multiple));
+                // orderDetail.setFlatAmount(orderDetail.getFlatAmount().multiply(multiple));
+                orderDetail.setFlatAmount(orderDetail.getFlatPrice().multiply(orderDetail.getFlatUsedElectricity()));
             }
             // 谷时段
             if (orderDetail.getValleyUsedElectricity() != null && orderDetail.getValleyUsedElectricity().compareTo(BigDecimal.ZERO) > 0) {
                 orderDetail.setValleyUsedElectricity(orderDetail.getValleyUsedElectricity().multiply(multiple));
-                orderDetail.setValleyAmount(orderDetail.getValleyAmount().multiply(multiple));
+                // orderDetail.setValleyAmount(orderDetail.getValleyAmount().multiply(multiple));
+                orderDetail.setValleyAmount(orderDetail.getValleyPrice().multiply(orderDetail.getValleyUsedElectricity()));
             }
+            orderDetail.setUpdateTime(DateUtils.getNowDate());
         }
         // 更新数据库
         int updateCount = 0;