From b16cb9f59bda1ecbfbb4eec51d46b734751d9b5c Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Tue, 3 Dec 2024 16:41:08 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A3=85=E5=A4=87=E6=96=B0=E5=A2=9E=E5=BF=85?= =?UTF-8?q?=E5=A1=AB=E9=A1=B9=E5=8E=BB=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/bonus/material/device/domain/DevInfo.java | 1 - .../bonus/material/order/service/impl/OrderServiceImpl.java | 5 +++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/DevInfo.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/DevInfo.java index 8fd0a84..9bd3684 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/DevInfo.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/DevInfo.java @@ -43,7 +43,6 @@ public class DevInfo extends BaseEntity { /** 设备编码 */ @Excel(name = "设备编码") @ApiModelProperty(value = "设备编码") - @NotBlank private String code; @ApiModelProperty(value = "装备名称") 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 3ffa1e2..8a3d874 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,5 +1,6 @@ package com.bonus.material.order.service.impl; +import com.bonus.common.biz.enums.MaStatusEnum; import com.bonus.common.security.utils.SecurityUtils; import com.bonus.material.device.domain.DevInfo; import com.bonus.material.order.domain.OrderDetailDto; @@ -38,7 +39,7 @@ public class OrderServiceImpl implements OrderService { DevInfo devInfo = orderMapper.getdeviceCount(orderDetailDto); if (devInfo.getDeviceCount() == 0) { // 查询库存是否为0，是的话让它下架 - orderDetailDto.setMaStatus("1"); + orderDetailDto.setMaStatus(MaStatusEnum.ON_HIRE.getCode().toString()); orderMapper.updateDeviceStatus(orderDetailDto); throw new RuntimeException(devInfo.getDeviceName() + "已下架，无法下单"); } else if (devInfo.getDeviceCount() < orderDetailDto.getNum()) { @@ -49,7 +50,7 @@ public class OrderServiceImpl implements OrderService { } } else { //如果是编码设备，改设备状态为在租 - orderDetailDto.setMaStatus("3"); + orderDetailDto.setMaStatus(MaStatusEnum.UNDER_RENT.getCode().toString()); orderMapper.updateDeviceStatus(orderDetailDto); } // 更改购物车状态为已下单