From db2f2f600589d647a7f8d55957fe7071d96487f8 Mon Sep 17 00:00:00 2001 From: SongZhang <2064194730@qq.com> Date: Tue, 24 Sep 2024 11:32:47 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=8E=92=E9=98=9F=E5=8F=96=E5=8F=B7=20?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/TbCallServiceImpl.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbCallServiceImpl.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbCallServiceImpl.java index 92f0aef..735aa31 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbCallServiceImpl.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbCallServiceImpl.java @@ -88,7 +88,7 @@ public class TbCallServiceImpl implements TbCallService { // .eq(TbCallQueue::getPhone, takeNumberDTO.getPhone()) .eq(TbCallQueue::getOpenId, takeNumberDTO.getOpenId()) .eq(TbCallQueue::getShopId, takeNumberDTO.getShopId()) - .eq(TbCallQueue::getCreateDay, DateUtil.today()) + .eq(TbCallQueue::getCreateDay, DateUtil.date().toString("yyyy-MM-dd")) .in(TbCallQueue::getState, 0, 1) .ne(TbCallQueue::getIsPostpone, 2) .eq(TbCallQueue::getCallTableId, takeNumberDTO.getCallTableId()).one(); @@ -102,7 +102,7 @@ public class TbCallServiceImpl implements TbCallService { callQueue.setShopId(shopInfo.getId()); callQueue.setShopName(shopInfo.getShopName()); callQueue.setCallNum(getCallNumber(takeNumberDTO.getShopId(), callTable)); - callQueue.setCreateDay(DateUtil.today()); + callQueue.setCreateDay(DateUtil.date().toString("yyyy-MM-dd")); boolean save = callQueueService.save(callQueue); // 打印排号票信息 mQUtils.printCallNumTicket(callQueue.getId(), callQueue.getShopId()); @@ -111,7 +111,7 @@ public class TbCallServiceImpl implements TbCallService { @Override public Object getList(Integer shopId, String openId, Integer queueId) { - return callQueueMapper.selectInfoByOpenId(shopId, openId, DateUtil.today(), queueId); + return callQueueMapper.selectInfoByOpenId(shopId, openId, DateUtil.date().toString("yyyy-MM-dd"), queueId); } @Override @@ -144,9 +144,9 @@ public class TbCallServiceImpl implements TbCallService { @Override public Object getState(String openId, Integer shopId, Integer queueId) { - List callQueueInfoVOS = callQueueMapper.selectInfoByOpenId(shopId, openId, DateUtil.today(), queueId); + List callQueueInfoVOS = callQueueMapper.selectInfoByOpenId(shopId, openId, DateUtil.date().toString("yyyy-MM-dd"), queueId); if (callQueueInfoVOS.isEmpty()) { - callQueueInfoVOS = callQueueMapper.selectInfoByOpenId(shopId, openId, DateUtil.today(), null); + callQueueInfoVOS = callQueueMapper.selectInfoByOpenId(shopId, openId, DateUtil.date().toString("yyyy-MM-dd"), null); } TbShopInfo shopInfo = shopInfoMapper.selectByPrimaryKey(shopId); HashMap data = new HashMap<>(); @@ -176,7 +176,7 @@ public class TbCallServiceImpl implements TbCallService { // .eq(TbCallQueue::getPhone, takeNumberDTO.getPhone()) .eq(TbCallQueue::getOpenId, subMsgDTO.getOpenId()) .eq(TbCallQueue::getShopId, subMsgDTO.getShopId()) - .eq(TbCallQueue::getCreateDay, DateUtil.today()) + .eq(TbCallQueue::getCreateDay, DateUtil.date().toString("yyyy-MM-dd")) .in(TbCallQueue::getState, 0, 1) .ne(TbCallQueue::getIsPostpone, 2) .eq(TbCallQueue::getCallTableId, queue.getCallTableId()).count();