Commit 6682a26e by 吕明尚

设备判断问题

parent e67e542a
...@@ -891,7 +891,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme ...@@ -891,7 +891,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
device.setRoomId(sOrder.getRoomId()); device.setRoomId(sOrder.getRoomId());
device.setDevType(DeviceType.DEVICE_CCEE.getCode()); device.setDevType(DeviceType.DEVICE_CCEE.getCode());
List<Device> deviceList = deviceService.selectDeviceList(device); List<Device> deviceList = deviceService.selectDeviceList(device);
if (CollectionUtils.isNotEmpty(deviceList)) { if (CollectionUtils.isEmpty(deviceList)) {
throw new BaseException("设备不存在!"); throw new BaseException("设备不存在!");
} }
if (sOrder.getStatus().equals(OrderStatusEnum.UNUSED.getCode())) { if (sOrder.getStatus().equals(OrderStatusEnum.UNUSED.getCode())) {
...@@ -921,7 +921,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme ...@@ -921,7 +921,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
device1.setRoomId(sOrder.getRoomId()); device1.setRoomId(sOrder.getRoomId());
device1.setDevType(DeviceType.DEVICE_0001.getCode()); device1.setDevType(DeviceType.DEVICE_0001.getCode());
List<Device> deviceList1 = deviceService.selectDeviceList(device1); List<Device> deviceList1 = deviceService.selectDeviceList(device1);
if (CollectionUtils.isNotEmpty(deviceList1)) { if (CollectionUtils.isEmpty(deviceList1)) {
throw new BaseException("设备不存在!"); throw new BaseException("设备不存在!");
} }
redisUtils.delete(ReceiptRdeisEnum.ORDER_NO.getValue() + sOrder.getOrderNo()); redisUtils.delete(ReceiptRdeisEnum.ORDER_NO.getValue() + sOrder.getOrderNo());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment