bonus
/
Bonus-Cloud-Material-Mall
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

订单原始天数

This commit is contained in:
sxu 2024-12-19 17:28:29 +08:00
parent 6ad88a582d
commit 56fefe798b
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderDetailDto.java
View File

@ -61,6 +61,9 @@ public class OrderDetailDto {
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date rentEndTime; private Date rentEndTime;
@ApiModelProperty(value = "订单原始天数")
private String originDays;
@ApiModelProperty(value = "天数") @ApiModelProperty(value = "天数")
private String days; private String days;

1
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java
View File

@ -111,6 +111,7 @@ public class OrderServiceImpl implements OrderService {
BigDecimal totalReliefPrice = BigDecimal.ZERO; BigDecimal totalReliefPrice = BigDecimal.ZERO;
for (OrderDetailDto detailDto : list) { for (OrderDetailDto detailDto : list) {
if (Objects.nonNull(detailDto) && String.valueOf(OrderStatusEnum.ORDER_FINISHED.getStatus()).equals(detailDto.getOrderStatus())) { 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())); detailDto.setDays(detailDto.getDateDays() == null ? detailDto.getDays() : String.valueOf(detailDto.getDateDays()));
if (detailDto.getChangeCost() != null) { if (detailDto.getChangeCost() != null) {
totalRentalPrice = totalRentalPrice.add(detailDto.getChangeCost()); totalRentalPrice = totalRentalPrice.add(detailDto.getChangeCost());