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

叫号列表查询条件修改，取消顺延功能

This commit is contained in:
SongZhang 2024-09-24 16:34:56 +08:00
parent 1e09c75ea0
commit 0a14ecdf16
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
eladmin-system/src/main/java/cn/ysk/cashier/service/impl/app/TbCallServiceImpl.java
View File

@ -263,7 +263,7 @@ public class TbCallServiceImpl implements TbCallService {
wxMiniUtils.sendCurrentOrNearCallMsg(shopInfo.getShopName(), getStrByState(Integer.valueOf(callQueue.getState())), wxMiniUtils.sendCurrentOrNearCallMsg(shopInfo.getShopName(), getStrByState(Integer.valueOf(callQueue.getState())),
callQueue.getCallNum(), current.isEmpty() ? "" : current.get(0).getCallNum(), "排号信息", callQueue.getOpenId(), false); callQueue.getCallNum(), current.isEmpty() ? "" : current.get(0).getCallNum(), "排号信息", callQueue.getOpenId(), false);
boolean flag = callQueueService.updateById(callQueue); callQueueService.updateById(callQueue);
TbCallConfig config = getConfig(callQueueDTO.getShopId()); TbCallConfig config = getConfig(callQueueDTO.getShopId());
// 临近用户提醒 // 临近用户提醒
@ -346,8 +346,8 @@ public class TbCallServiceImpl implements TbCallService {
Byte isPostpone = callTable.getIsPostpone(); Byte isPostpone = callTable.getIsPostpone();
Integer postponeNum = callTable.getPostponeNum(); Integer postponeNum = callTable.getPostponeNum();
// 判断是否需要顺延 // 判断是否需要顺延, 暂时注释
if (callQueue.getIsPostpone() == 0 && isPostpone != null && isPostpone == 1 && postponeNum != null && postponeNum > 0) { if (false && callQueue.getIsPostpone() == 0 && isPostpone != null && isPostpone == 1 && postponeNum != null && postponeNum > 0) {
// 查询当前桌以及顺延桌数 // 查询当前桌以及顺延桌数
List<TbCallQueue> current = callQueueService.lambdaQuery() List<TbCallQueue> current = callQueueService.lambdaQuery()
.eq(TbCallQueue::getCallTableId, callQueue.getCallTableId()) .eq(TbCallQueue::getCallTableId, callQueue.getCallTableId())
@ -435,7 +435,7 @@ public class TbCallServiceImpl implements TbCallService {
LambdaQueryChainWrapper<TbCallQueue> q = callQueueService.lambdaQuery() LambdaQueryChainWrapper<TbCallQueue> q = callQueueService.lambdaQuery()
.eq(TbCallQueue::getCallTableId, item.getId()) .eq(TbCallQueue::getCallTableId, item.getId())
.eq(TbCallQueue::getShopId, shopId) .eq(TbCallQueue::getShopId, shopId)
.ne(TbCallQueue::getIsPostpone, 2) .notIn(TbCallQueue::getIsPostpone, 1, 2)
.eq(TbCallQueue::getCreateDay, DateUtil.today()) .eq(TbCallQueue::getCreateDay, DateUtil.today())
.in(TbCallQueue::getState, 0, 1, 3); .in(TbCallQueue::getState, 0, 1, 3);
Long count = q.count(); Long count = q.count();
@ -563,4 +563,5 @@ public class TbCallServiceImpl implements TbCallService {
tbCallConfig.setUpdateTime(DateUtil.date().toInstant()); tbCallConfig.setUpdateTime(DateUtil.date().toInstant());
return tbCallConfigService.updateById(tbCallConfig); return tbCallConfigService.updateById(tbCallConfig);
} }
} }