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

设备不需要根据manageType判断了

This commit is contained in:
liang.chao 2024-12-06 16:12:20 +08:00
parent 6b0b81af0d
commit 5cb179f17c
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,7 @@
package com.bonus.material.order.controller; package com.bonus.material.order.controller;
import cn.hutool.core.collection.CollectionUtil;
import com.bonus.common.biz.enums.MaStatusEnum;
import com.bonus.common.biz.enums.OrderStatusEnum; import com.bonus.common.biz.enums.OrderStatusEnum;
import com.bonus.common.core.web.controller.BaseController; import com.bonus.common.core.web.controller.BaseController;
import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.core.web.domain.AjaxResult;
@ -83,29 +85,29 @@ public class OrderController extends BaseController {
return error("参数错误"); return error("参数错误");
} }
// 退租 // 退租
/* if (orderInfoDto.getOrderStatus().equals("5")) { 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) { if (dtos.size() > 0 && CollectionUtil.isNotEmpty(dtos)) {
for (OrderDetailDto dto : dtos) { for (OrderDetailDto dto : dtos) {
if ("0".equals(dto.getManageType())) { // if ("0".equals(dto.getManageType())) {
// 编码设备已退租的先下架 // 编码设备已退租的先下架
dto.setMaStatus("1"); dto.setMaStatus("1");
orderMapper.updateDeviceStatus(dto); orderMapper.updateDeviceStatus(dto);
} else { /* } else {
// 数量设备已退租的增加库存 // 数量设备已退租的增加库存
orderMapper.updateAddDevCount(dto); orderMapper.updateAddDevCount(dto);
} }*/
} }
} }
}*/ }
// 取消 // 取消
if (orderInfoDto.getOrderStatus().equals(OrderStatusEnum.ORDER_CANCEL.getStatus())) { if (orderInfoDto.getOrderStatus().equals(OrderStatusEnum.ORDER_CANCEL.getStatus())) {
List<OrderDetailDto> dtos = orderMapper.getOrderDetailsByOrderId(orderInfoDto.getOrderId()); List<OrderDetailDto> dtos = orderMapper.getOrderDetailsByOrderId(orderInfoDto.getOrderId());
if (dtos.size() > 0) { if (dtos.size() > 0 && CollectionUtil.isNotEmpty(dtos)) {
for (OrderDetailDto dto : dtos) { for (OrderDetailDto dto : dtos) {
// if ("0".equals(dto.getManageType())) { // if ("0".equals(dto.getManageType())) {
// 编码设备已取消的继续上架 // 编码设备已取消的继续上架
dto.setMaStatus("2"); dto.setMaStatus(MaStatusEnum.LISTING.getCode().toString());
orderMapper.updateDeviceStatus(dto); orderMapper.updateDeviceStatus(dto);
/* } else { /* } else {
// 数量设备已退租的增加库存 // 数量设备已退租的增加库存