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-11 14:23:15 +08:00
parent 9d68eeacfc
commit 4c569aaf19
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java
View File

@ -88,15 +88,18 @@ public class OrderController extends BaseController {
if (orderInfoDto.getOrderStatus().equals(OrderStatusEnum.ORDER_UNDER_LEASE.getStatus())) { if (orderInfoDto.getOrderStatus().equals(OrderStatusEnum.ORDER_UNDER_LEASE.getStatus())) {
List<OrderDetailDto> dtos = orderMapper.getOrderDetailsByOrderId(orderInfoDto.getOrderId()); List<OrderDetailDto> dtos = orderMapper.getOrderDetailsByOrderId(orderInfoDto.getOrderId());
if (dtos.size() > 0 && CollectionUtil.isNotEmpty(dtos)) { if (dtos.size() > 0 && CollectionUtil.isNotEmpty(dtos)) {
if (CollectionUtil.isNotEmpty(orderInfoDto.getMaIds())) {
for (OrderDetailDto dto : dtos) { for (OrderDetailDto dto : dtos) {
// if ("0".equals(dto.getManageType())) { if (orderInfoDto.getMaIds().contains(dto.getMaId())) {
// 编码设备已退租的先下架
dto.setMaStatus("1"); dto.setMaStatus("1");
orderMapper.updateDeviceStatus(dto); orderMapper.updateDeviceStatus(dto);
/* } else { }
// 数量设备已退租的增加库存 }
orderMapper.updateAddDevCount(dto); } else {
}*/ for (OrderDetailDto dto : dtos) {
dto.setMaStatus("1");
orderMapper.updateDeviceStatus(dto);
}
} }
} }
} }

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

@ -30,6 +30,9 @@ public class OrderDetailDto {
@ApiModelProperty(value = "设备id") @ApiModelProperty(value = "设备id")
private Integer maId; private Integer maId;
@ApiModelProperty(value = "设备ids")
private List<Integer> maIds;
@ApiModelProperty(value = "设备类型id") @ApiModelProperty(value = "设备类型id")
private Integer typeId; private Integer typeId;