czg_team/cashier-admin-java
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

台桌预订改造

Browse Source
This commit is contained in:
谭凯凯
2024-12-13 16:45:34 +08:00
committed by Tankaikai
parent 2ce9909e1b
commit b9e0101841
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
View File

@@ -303,12 +303,14 @@ public class TbShopTableServiceImpl implements TbShopTableService {
if (StrUtil.isBlank(data.getQrcode())) { if (StrUtil.isBlank(data.getQrcode())) {
data.setStatus("unbind"); data.setStatus("unbind");
} else if ((countMap.get(data.getQrcode()) == null || countMap.get(data.getQrcode()) < 1) && !TableStateEnum.CLEANING.getState().equals(data.getStatus())) { } else if ((countMap.get(data.getQrcode()) == null || countMap.get(data.getQrcode()) < 1) && !TableStateEnum.CLEANING.getState().equals(data.getStatus())) {
if (!TableStateEnum.SUBSCRIBE.getState().equals(data.getStatus())) {
data.setStatus("idle"); data.setStatus("idle");
mpShopTableMapper.update(null, new LambdaUpdateWrapper<TbShopTable>() mpShopTableMapper.update(null, new LambdaUpdateWrapper<TbShopTable>()
.eq(TbShopTable::getQrcode, data.getQrcode()) .eq(TbShopTable::getQrcode, data.getQrcode())
.ne(TbShopTable::getStatus, TableStateEnum.SUBSCRIBE.getState()) .ne(TbShopTable::getStatus, TableStateEnum.SUBSCRIBE.getState())
.set(TbShopTable::getStatus, TableStateEnum.IDLE.getState())); .set(TbShopTable::getStatus, TableStateEnum.IDLE.getState()));
} }
}
Map<String, Object> itemMap = BeanUtil.beanToMap(data, false, false); Map<String, Object> itemMap = BeanUtil.beanToMap(data, false, false);
if ((data.getStatus().equals("using") || data.getStatus().equals("cleaning")) && data.getUseTime() != null) { if ((data.getStatus().equals("using") || data.getStatus().equals("cleaning")) && data.getUseTime() != null) {
itemMap.put("durationTime", DateUtil.current() - data.getUseTime().getTime()); itemMap.put("durationTime", DateUtil.current() - data.getUseTime().getTime());