From 6b7eae8354060f0bddbf5202ff3f6a5c8ef2083f Mon Sep 17 00:00:00 2001 From: SjS Date: Tue, 20 May 2025 15:10:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=A5=97=E9=A4=90bug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9,=E5=A4=AA=E7=B1=B3=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/common/pay/tm/vo/TmTradeInfo.java | 2 +- .../booth/service/impl/BoothServiceImpl.java | 31 +++++++------------ .../suit/service/impl/SuitConverterImpl.java | 2 +- .../suit/service/impl/SuitServiceImpl.java | 8 +++-- .../com/ruoyi/web/app/AppBoothController.java | 8 ++--- .../com/ruoyi/web/bst/SuitController.java | 1 - 6 files changed, 23 insertions(+), 29 deletions(-) diff --git a/common-ruoyi/ruoyi-common/src/main/java/com/ruoyi/common/pay/tm/vo/TmTradeInfo.java b/common-ruoyi/ruoyi-common/src/main/java/com/ruoyi/common/pay/tm/vo/TmTradeInfo.java index aa7d822..b7cb413 100644 --- a/common-ruoyi/ruoyi-common/src/main/java/com/ruoyi/common/pay/tm/vo/TmTradeInfo.java +++ b/common-ruoyi/ruoyi-common/src/main/java/com/ruoyi/common/pay/tm/vo/TmTradeInfo.java @@ -9,7 +9,7 @@ public class TmTradeInfo { /** * 太米系统流水Id */ - private Integer id; + private String id; /** * 第三方内部流水号 diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/booth/service/impl/BoothServiceImpl.java b/ruoyi-service/src/main/java/com/ruoyi/bst/booth/service/impl/BoothServiceImpl.java index cabd5e1..2a4e2a4 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/booth/service/impl/BoothServiceImpl.java +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/booth/service/impl/BoothServiceImpl.java @@ -195,20 +195,13 @@ public class BoothServiceImpl implements BoothService { query.setUserId(userId); query.setTime(LocalDateTime.now()); List list = boothMapper.selectBoothList(query); - if (list != null && !list.isEmpty()){ - return CollectionUtils.firstElement(list); - }; + for (BoothVO vo : list) { + vo.setUserId(null); + boothMapper.updateBooth(vo); + } BoothVO booth = boothMapper.selectBoothByBoothNo(boothNo); ServiceUtil.assertion(booth == null, "当前卡座不存在"); - if (booth.getUserId() != null && booth.getExpiredTime() != null && booth.getExpiredTime().isAfter(LocalDateTime.now())) { - // 卡座未过期，被其他用户绑定 - ServiceUtil.assertion(!booth.getUserId().equals(userId), "卡座已被绑定"); - // 卡座未过期，被当前用户绑定 - ServiceUtil.assertion(booth.getUserId().equals(userId), "请勿重复绑定该设备"); - } else { - booth.setExpiredTime(LocalDateTime.now().plusMinutes(30)); - booth.setUserId(userId); - } + booth.setUserId(userId); int i = boothMapper.updateBooth(booth); ServiceUtil.assertion(i == 0, "操作失败"); return booth; @@ -286,14 +279,14 @@ public class BoothServiceImpl implements BoothService { deviceQuery.setBoothNo(booth.getBoothNo()); List deviceVOList = deviceMapper.selectDeviceList(deviceQuery); + ServiceUtil.assertion(deviceVOList.isEmpty(), "当前卡座下无设备"); + // 设备相关校验 - if (deviceVOList != null && !deviceVOList.isEmpty()) { - deviceVOList.forEach(deviceVO -> { - ServiceUtil.assertion(deviceVO == null || deviceVO.getDeviceId() == null, "设备不存在"); - ServiceUtil.assertion(StringUtils.isAllBlank(deviceVO.getMac(), deviceVO.getMac2()), "设备MAC号为空"); - ServiceUtil.assertion(deviceVO.getDuration() == null, "设备编号为%s的设备暂未设置开启时长", deviceVO.getDeviceNo()); - }); - } + deviceVOList.forEach(deviceVO -> { + ServiceUtil.assertion(deviceVO == null || deviceVO.getDeviceId() == null, "设备不存在"); + ServiceUtil.assertion(StringUtils.isAllBlank(deviceVO.getMac(), deviceVO.getMac2()), "设备MAC号为空"); + ServiceUtil.assertion(deviceVO.getDuration() == null, "设备编号为%s的设备暂未设置开启时长", deviceVO.getDeviceNo()); + }); // 新建IotVO 返回数据库操作与物联网操作结果 DeviceIotVO iotVO = new DeviceIotVO(); diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/suit/service/impl/SuitConverterImpl.java b/ruoyi-service/src/main/java/com/ruoyi/bst/suit/service/impl/SuitConverterImpl.java index 3872f83..50871ea 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/suit/service/impl/SuitConverterImpl.java +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/suit/service/impl/SuitConverterImpl.java @@ -8,6 +8,7 @@ import org.springframework.stereotype.Service; @Service public class SuitConverterImpl implements SuitConverter { + @Override public Suit toPoByCreate(Suit data) { if (data == null) { @@ -15,7 +16,6 @@ public class SuitConverterImpl implements SuitConverter { } Suit po = new Suit(); // 设置基本信息 - po.setUserId(data.getUserId()); po.setStoreId(data.getStoreId()); po.setOrderNum(data.getOrderNum()); po.setLightingNums(data.getLightingNums()); diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/suit/service/impl/SuitServiceImpl.java b/ruoyi-service/src/main/java/com/ruoyi/bst/suit/service/impl/SuitServiceImpl.java index 741a501..08827cc 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/suit/service/impl/SuitServiceImpl.java +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/suit/service/impl/SuitServiceImpl.java @@ -65,6 +65,8 @@ public class SuitServiceImpl implements SuitService @Override public int insertSuit(Suit suit) { + StoreVO store = storeService.selectStoreById(suit.getStoreId()); + suit.setUserId(store.getUserId()); suit.setCreateTime(DateUtils.getNowDate()); return suitMapper.insertSuit(suit); } @@ -78,9 +80,9 @@ public class SuitServiceImpl implements SuitService @Override public int updateSuit(Suit suit) { - StoreVO StoreVO = storeService.selectStoreById(suit.getStoreId()); - ServiceUtil.assertion(StoreVO==null,"当前店铺不存在"); - suit.setUserId(StoreVO.getUserId()); + StoreVO store = storeService.selectStoreById(suit.getStoreId()); + ServiceUtil.assertion(store==null,"当前店铺不存在"); + suit.setUserId(store.getUserId()); return suitMapper.updateSuit(suit); } diff --git a/ruoyi-web/src/main/java/com/ruoyi/web/app/AppBoothController.java b/ruoyi-web/src/main/java/com/ruoyi/web/app/AppBoothController.java index ca15ee8..7242bfe 100644 --- a/ruoyi-web/src/main/java/com/ruoyi/web/app/AppBoothController.java +++ b/ruoyi-web/src/main/java/com/ruoyi/web/app/AppBoothController.java @@ -32,12 +32,12 @@ public class AppBoothController extends BaseController { private BoothService boothService; @ApiOperation("爆灯") - @PutMapping("/{boothNo}/lighting") - public AjaxResult lighting(@PathVariable @ApiParam("设备id") String boothNo,boolean requiredIot) { - if (boothNo == null) { + @PutMapping("/{boothId}/lighting") + public AjaxResult lighting(@PathVariable @ApiParam("设备id") Long boothId,boolean requiredIot) { + if (boothId == null) { return error("卡座编号不能为空"); } - BoothVO booth = boothService.selectBoothByBoothNo(boothNo); + BoothVO booth = boothService.selectBoothByBoothId(boothId); if (booth == null) { return error("当前卡座信息不存在"); } diff --git a/ruoyi-web/src/main/java/com/ruoyi/web/bst/SuitController.java b/ruoyi-web/src/main/java/com/ruoyi/web/bst/SuitController.java index 2373bd3..5495c06 100644 --- a/ruoyi-web/src/main/java/com/ruoyi/web/bst/SuitController.java +++ b/ruoyi-web/src/main/java/com/ruoyi/web/bst/SuitController.java @@ -98,7 +98,6 @@ public class SuitController extends BaseController if (!userValidator.canView(suit.getUserId())) { suit.setUserId(getUserId()); } - suit.setUserId(getUserId()); suitConverter.toPoByCreate(suit); return toAjax(suitService.insertSuit(suit)); }