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();