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-12 10:19:31 +08:00
parent 3e46f5ae35
commit d98fdf7a8f
5 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bonus-common-biz/src/main/java/com/bonus/common/biz/enums/OrderStatusEnum.java
View File

@ -15,10 +15,11 @@ public enum OrderStatusEnum {
ORDER_RECEIVE(2, "已接单-待出库"), ORDER_RECEIVE(2, "已接单-待出库"),
ORDER_PENDING_SHIPMENT(3, "已出库-待收货"), ORDER_PENDING_SHIPMENT(3, "已出库-待收货"),
ORDER_AWAITING_RECEIPT(4, "已收货-租赁中"), ORDER_AWAITING_RECEIPT(4, "已收货-租赁中"),
ORDER_UNDER_LEASE(5, "已退租-待结算"), ORDER_UNDER_LEASE(5, "已退租-待检修"),
ORDER_TERMINATED(6, "已结算-待确认"), ORDER_REPAIRED(10, "已检修-待结算"),
ORDER_FINISHED(7, "已完成"), ORDER_TERMINATED(15, "已结算-待确认"),
ORDER_CANCEL(8, "已取消"); ORDER_FINISHED(20, "已完成"),
ORDER_CANCEL(99, "已取消");

2
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/service/impl/LeaseRepairRecordServiceImpl.java
View File

@ -331,7 +331,7 @@ public class LeaseRepairRecordServiceImpl implements LeaseRepairRecordService {
} }
LeaseRepairRecord leaseRepairRecord = new LeaseRepairRecord(); LeaseRepairRecord leaseRepairRecord = new LeaseRepairRecord();
leaseRepairRecord.setOrderId(leaseRecordDto.getOrderId()); leaseRepairRecord.setOrderId(leaseRecordDto.getOrderId());
leaseRepairRecord.setOrderStatus(OrderStatusEnum.ORDER_TERMINATED.getStatus()); leaseRepairRecord.setOrderStatus(OrderStatusEnum.ORDER_REPAIRED.getStatus());
leaseRepairRecord.setMaIds(maIdList); leaseRepairRecord.setMaIds(maIdList);
result += orderMapper.updateOrder(leaseRepairRecord); result += orderMapper.updateOrder(leaseRepairRecord);
// 返回结果 // 返回结果

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

@ -71,7 +71,7 @@ public class OrderDetailDto {
@ApiModelProperty(value = "日租金") @ApiModelProperty(value = "日租金")
private BigDecimal dayLeasePrice; 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; private String orderStatus;
@ApiModelProperty(value = "创建日期") @ApiModelProperty(value = "创建日期")

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

@ -119,4 +119,7 @@ public class OrderInfoDto {
@ApiModelProperty(value = "是否已填写退租检修内容（0 否，1 是）") @ApiModelProperty(value = "是否已填写退租检修内容（0 否，1 是）")
private Integer isLeaseContent; private Integer isLeaseContent;
@ApiModelProperty(value = "是否部分退租")
private boolean isPartBacked;
} }

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

@ -1,6 +1,7 @@
package com.bonus.material.order.service.impl; package com.bonus.material.order.service.impl;
import com.bonus.common.biz.enums.MaStatusEnum; import com.bonus.common.biz.enums.MaStatusEnum;
import com.bonus.common.biz.enums.OrderStatusEnum;
import com.bonus.common.security.utils.SecurityUtils; import com.bonus.common.security.utils.SecurityUtils;
import com.bonus.material.device.domain.DevInfo; import com.bonus.material.device.domain.DevInfo;
import com.bonus.material.lease.mapper.LeaseRepairRecordMapper; import com.bonus.material.lease.mapper.LeaseRepairRecordMapper;
@ -114,6 +115,7 @@ public class OrderServiceImpl implements OrderService {
} else { } else {
dto.setIsLeaseContent(0); dto.setIsLeaseContent(0);
} }
dto.setPartBacked(list.stream().anyMatch(o -> OrderStatusEnum.ORDER_UNDER_LEASE.getStatus().toString().equals(o.getOrderStatus())));
} }
return orderInfoDtos; return orderInfoDtos;
} }