From ff389a69d764a689a6f55680f3d01e27ab3f6e21 Mon Sep 17 00:00:00 2001 From: Lemon Date: Mon, 8 May 2023 10:38:02 +0800 Subject: [PATCH] update --- .../src/main/java/com/jsowell/service/OrderService.java | 4 ++-- .../main/java/com/jsowell/common/util/LianLianUtils.java | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 jsowell-common/src/main/java/com/jsowell/common/util/LianLianUtils.java diff --git a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java index 01728c6e1..68567aaee 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -816,7 +816,7 @@ public class OrderService { peak.setServiceAmount(peak.getServicePrice().multiply(peak.getUsedElectricity()).setScale(2, BigDecimal.ROUND_DOWN)); OrderDetailInfoVO.ChargeDetail flat = new OrderDetailInfoVO.ChargeDetail(); - flat.setPeriodType(BillingTimeEnum.PEAK.getLabel()); + flat.setPeriodType(BillingTimeEnum.FLAT.getLabel()); flat.setElectricityPrice(orderDetail.getFlatElectricityPrice()); flat.setServicePrice(orderDetail.getFlatServicePrice()); flat.setUsedElectricity(orderDetail.getFlatUsedElectricity()); @@ -824,7 +824,7 @@ public class OrderService { flat.setServiceAmount(flat.getServicePrice().multiply(flat.getUsedElectricity()).setScale(2, BigDecimal.ROUND_DOWN)); OrderDetailInfoVO.ChargeDetail valley = new OrderDetailInfoVO.ChargeDetail(); - valley.setPeriodType(BillingTimeEnum.PEAK.getLabel()); + valley.setPeriodType(BillingTimeEnum.VALLEY.getLabel()); valley.setElectricityPrice(orderDetail.getValleyElectricityPrice()); valley.setServicePrice(orderDetail.getValleyServicePrice()); valley.setUsedElectricity(orderDetail.getValleyUsedElectricity()); diff --git a/jsowell-common/src/main/java/com/jsowell/common/util/LianLianUtils.java b/jsowell-common/src/main/java/com/jsowell/common/util/LianLianUtils.java new file mode 100644 index 000000000..712ea2107 --- /dev/null +++ b/jsowell-common/src/main/java/com/jsowell/common/util/LianLianUtils.java @@ -0,0 +1,7 @@ +package com.jsowell.common.util;/** + * TODO + * + * @author JS-ZZA + * @date 2023/5/6 14:22 + */public class LianLianUtils { +}