diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/booth/mapper/BoothMapper.xml b/ruoyi-service/src/main/java/com/ruoyi/bst/booth/mapper/BoothMapper.xml
index f3df933..c4f562a 100644
--- a/ruoyi-service/src/main/java/com/ruoyi/bst/booth/mapper/BoothMapper.xml
+++ b/ruoyi-service/src/main/java/com/ruoyi/bst/booth/mapper/BoothMapper.xml
@@ -47,6 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and bb.user_id = #{query.userId}
and bb.deleted = #{query.deleted}
and bb.booth_id = #{query.boothId}
+ and bs.store_id = #{query.storeId}
and bb.booth_name like concat('%', #{query.boothName}, '%')
and bb.picture = #{query.picture}
and bp.part_name like concat('%', #{query.partName}, '%')
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 14ae1de..df287c7 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
@@ -267,7 +267,6 @@ public class BoothServiceImpl implements BoothService {
// 操作校验
ServiceUtil.assertion(booth.getStoreId() == null, "当前卡座未绑定店铺");
- ServiceUtil.assertion(booth.getExpiredTime().isBefore(LocalDateTime.now()), "请重新绑定卡座");
// 判断当前用户是否在该店铺下有余额
LightingNumVO vo = lightingNumMapper.selectLightingNumByUserId(userId, booth.getStoreId());
@@ -340,7 +339,7 @@ public class BoothServiceImpl implements BoothService {
ServiceUtil.assertion(res == null, "设备爆灯失败:未知错误");
return IotUtil.isSuccess(res);
} else {
- ServiceUtil.assertion(true, "爆灯频繁,请稍等后再进行爆灯");
+ ServiceUtil.assertion(true, "当前设备正在爆灯,请等待爆灯结束后再进行操作");
}
return false;
}
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 92d6c0f..ac1737e 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
@@ -41,12 +41,6 @@ public class AppBoothController extends BaseController {
if (booth == null) {
return error("当前卡座信息不存在");
}
- if (booth.getUserId()==null) {
- return error("您无权操作当前卡座设备");
- }
- if (!booth.getUserId().equals(getUserId())){
- return error("您无权操作当前卡座设备");
- }
return success(boothService.lighting(booth,getUserId(),requiredIot));
}