From 5337df11edc21e58fe52ec80a72433b6a77370e5 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Fri, 16 Jun 2023 09:13:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/jsowell/service/OrderService.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 0e38b6c23..d784dfd40 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -64,7 +64,6 @@ import java.util.*; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; - @Service public class OrderService { private final Logger log = LoggerFactory.getLogger(this.getClass()); @@ -527,8 +526,10 @@ public class OrderService { if (StringUtils.equals(dto.getStartType(), StartTypeEnum.APPOINTMENT.getValue())) { orderBasicInfo.setAppointmentTime(DateUtils.parseDate(dto.getAppointmentTime(), DateUtils.YYYY_MM_DD_HH_MM_SS)); } + // 订单详情 BillingTemplateVO billingTemplate = dto.getBillingTemplate(); + log.info("订单使用的计费模板-orderCode:{}, billingTemplate:{}", orderCode, JSONObject.toJSONString(billingTemplate)); BigDecimal sharpElectricityPrice = billingTemplate.getSharpElectricityPrice() != null ? billingTemplate.getSharpElectricityPrice() : BigDecimal.ZERO; BigDecimal sharpServicePrice = billingTemplate.getSharpServicePrice() != null ? billingTemplate.getSharpServicePrice() : BigDecimal.ZERO; BigDecimal peakElectricityPrice = billingTemplate.getPeakElectricityPrice() != null ? billingTemplate.getPeakElectricityPrice() : BigDecimal.ZERO; @@ -537,6 +538,7 @@ public class OrderService { BigDecimal flatServicePrice = billingTemplate.getFlatServicePrice() != null ? billingTemplate.getFlatServicePrice() : BigDecimal.ZERO; BigDecimal valleyElectricityPrice = billingTemplate.getValleyElectricityPrice() != null ? billingTemplate.getValleyElectricityPrice() : BigDecimal.ZERO; BigDecimal valleyServicePrice = billingTemplate.getValleyServicePrice() != null ? billingTemplate.getValleyServicePrice() : BigDecimal.ZERO; + OrderDetail orderDetail = OrderDetail.builder() .orderCode(orderCode) .sharpPrice(sharpElectricityPrice.add(sharpServicePrice))