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 6f43f7a9d..75dc11d32 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -818,7 +818,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()); BigDecimal flatUsedElectricity = orderDetail.getFlatUsedElectricity() == null ? BigDecimal.ZERO : orderDetail.getFlatUsedElectricity(); @@ -827,7 +827,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()); BigDecimal valleyUsedElectricity = orderDetail.getValleyUsedElectricity() == null ? BigDecimal.ZERO : 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 { +}