From d98fdf7a8fc47d1ce4858fdaa3d5bfb6cb310209 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Thu, 12 Dec 2024 10:19:31 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=80=E7=A7=9F=E6=A3=80=E4=BF=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bonus/common/biz/enums/OrderStatusEnum.java | 9 +++++---- .../lease/service/impl/LeaseRepairRecordServiceImpl.java | 2 +- .../com/bonus/material/order/domain/OrderDetailDto.java | 2 +- .../com/bonus/material/order/domain/OrderInfoDto.java | 3 +++ .../material/order/service/impl/OrderServiceImpl.java | 2 ++ 5 files changed, 12 insertions(+), 6 deletions(-) diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/OrderStatusEnum.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/OrderStatusEnum.java index e874708..4746f07 100644 --- a/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/OrderStatusEnum.java +++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/OrderStatusEnum.java @@ -15,10 +15,11 @@ public enum OrderStatusEnum { ORDER_RECEIVE(2, "已接单-待出库"), ORDER_PENDING_SHIPMENT(3, "已出库-待收货"), ORDER_AWAITING_RECEIPT(4, "已收货-租赁中"), - ORDER_UNDER_LEASE(5, "已退租-待结算"), - ORDER_TERMINATED(6, "已结算-待确认"), - ORDER_FINISHED(7, "已完成"), - ORDER_CANCEL(8, "已取消"); + ORDER_UNDER_LEASE(5, "已退租-待检修"), + ORDER_REPAIRED(10, "已检修-待结算"), + ORDER_TERMINATED(15, "已结算-待确认"), + ORDER_FINISHED(20, "已完成"), + ORDER_CANCEL(99, "已取消"); diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/service/impl/LeaseRepairRecordServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/service/impl/LeaseRepairRecordServiceImpl.java index 2af424c..530f429 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/service/impl/LeaseRepairRecordServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/service/impl/LeaseRepairRecordServiceImpl.java @@ -331,7 +331,7 @@ public class LeaseRepairRecordServiceImpl implements LeaseRepairRecordService { } LeaseRepairRecord leaseRepairRecord = new LeaseRepairRecord(); leaseRepairRecord.setOrderId(leaseRecordDto.getOrderId()); - leaseRepairRecord.setOrderStatus(OrderStatusEnum.ORDER_TERMINATED.getStatus()); + leaseRepairRecord.setOrderStatus(OrderStatusEnum.ORDER_REPAIRED.getStatus()); leaseRepairRecord.setMaIds(maIdList); result += orderMapper.updateOrder(leaseRepairRecord); // 返回结果 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 a63f664..6106fe0 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 @@ -71,7 +71,7 @@ public class OrderDetailDto { @ApiModelProperty(value = "日租金") private BigDecimal dayLeasePrice; - @ApiModelProperty(value = "订单状态（0未下单 1已下单 2待出库 3待收货 4租赁中 5已退租 6已完成 7已取消）") + @ApiModelProperty(value = "订单状态（0未下单 1已下单 2待出库 3待收货 4租赁中 5已退租 10已检修 15已结算 20已完成 99已取消）") private String orderStatus; @ApiModelProperty(value = "创建日期") diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderInfoDto.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderInfoDto.java index 9d0d7c4..a05329e 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderInfoDto.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderInfoDto.java @@ -119,4 +119,7 @@ public class OrderInfoDto { @ApiModelProperty(value = "是否已填写退租检修内容（0 否，1 是）") private Integer isLeaseContent; + @ApiModelProperty(value = "是否部分退租") + private boolean isPartBacked; + } 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 3ae1745..2fd6ca4 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 @@ -1,6 +1,7 @@ package com.bonus.material.order.service.impl; import com.bonus.common.biz.enums.MaStatusEnum; +import com.bonus.common.biz.enums.OrderStatusEnum; import com.bonus.common.security.utils.SecurityUtils; import com.bonus.material.device.domain.DevInfo; import com.bonus.material.lease.mapper.LeaseRepairRecordMapper; @@ -114,6 +115,7 @@ public class OrderServiceImpl implements OrderService { } else { dto.setIsLeaseContent(0); } + dto.setPartBacked(list.stream().anyMatch(o -> OrderStatusEnum.ORDER_UNDER_LEASE.getStatus().toString().equals(o.getOrderStatus()))); } return orderInfoDtos; }