From 56fefe798be3841116d59dede66e7c44dfe88b7c Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Thu, 19 Dec 2024 17:28:29 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=8E=9F=E5=A7=8B=E5=A4=A9?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bonus/material/order/domain/OrderDetailDto.java | 3 +++ .../bonus/material/order/service/impl/OrderServiceImpl.java | 1 + 2 files changed, 4 insertions(+) diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderDetailDto.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderDetailDto.java index 184b38f..152e924 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderDetailDto.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderDetailDto.java @@ -61,6 +61,9 @@ public class OrderDetailDto { @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date rentEndTime; + @ApiModelProperty(value = "订单原始天数") + private String originDays; + @ApiModelProperty(value = "天数") private String days; diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java index 68b7bcd..3843327 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java @@ -111,6 +111,7 @@ public class OrderServiceImpl implements OrderService { BigDecimal totalReliefPrice = BigDecimal.ZERO; for (OrderDetailDto detailDto : list) { if (Objects.nonNull(detailDto) && String.valueOf(OrderStatusEnum.ORDER_FINISHED.getStatus()).equals(detailDto.getOrderStatus())) { + detailDto.setOriginDays(detailDto.getDays()); detailDto.setDays(detailDto.getDateDays() == null ? detailDto.getDays() : String.valueOf(detailDto.getDateDays())); if (detailDto.getChangeCost() != null) { totalRentalPrice = totalRentalPrice.add(detailDto.getChangeCost());