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

1.排队取号 时间格式调整

Browse Source
This commit is contained in:
SongZhang
2024-09-24 11:32:47 +08:00
parent 92fc8debbe
commit db2f2f6005
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbCallServiceImpl.java
View File

@@ -88,7 +88,7 @@ public class TbCallServiceImpl implements TbCallService {
// .eq(TbCallQueue::getPhone, takeNumberDTO.getPhone()) // .eq(TbCallQueue::getPhone, takeNumberDTO.getPhone())
.eq(TbCallQueue::getOpenId, takeNumberDTO.getOpenId()) .eq(TbCallQueue::getOpenId, takeNumberDTO.getOpenId())
.eq(TbCallQueue::getShopId, takeNumberDTO.getShopId()) .eq(TbCallQueue::getShopId, takeNumberDTO.getShopId())
.eq(TbCallQueue::getCreateDay, DateUtil.today()) .eq(TbCallQueue::getCreateDay, DateUtil.date().toString("yyyy-MM-dd"))
.in(TbCallQueue::getState, 0, 1) .in(TbCallQueue::getState, 0, 1)
.ne(TbCallQueue::getIsPostpone, 2) .ne(TbCallQueue::getIsPostpone, 2)
.eq(TbCallQueue::getCallTableId, takeNumberDTO.getCallTableId()).one(); .eq(TbCallQueue::getCallTableId, takeNumberDTO.getCallTableId()).one();
@@ -102,7 +102,7 @@ public class TbCallServiceImpl implements TbCallService {
callQueue.setShopId(shopInfo.getId()); callQueue.setShopId(shopInfo.getId());
callQueue.setShopName(shopInfo.getShopName()); callQueue.setShopName(shopInfo.getShopName());
callQueue.setCallNum(getCallNumber(takeNumberDTO.getShopId(), callTable)); callQueue.setCallNum(getCallNumber(takeNumberDTO.getShopId(), callTable));
callQueue.setCreateDay(DateUtil.today()); callQueue.setCreateDay(DateUtil.date().toString("yyyy-MM-dd"));
boolean save = callQueueService.save(callQueue); boolean save = callQueueService.save(callQueue);
// 打印排号票信息 // 打印排号票信息
mQUtils.printCallNumTicket(callQueue.getId(), callQueue.getShopId()); mQUtils.printCallNumTicket(callQueue.getId(), callQueue.getShopId());
@@ -111,7 +111,7 @@ public class TbCallServiceImpl implements TbCallService {
@Override @Override
public Object getList(Integer shopId, String openId, Integer queueId) { 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 @Override
@@ -144,9 +144,9 @@ public class TbCallServiceImpl implements TbCallService {
@Override @Override
public Object getState(String openId, Integer shopId, Integer queueId) { public Object getState(String openId, Integer shopId, Integer queueId) {
List<CallQueueInfoVO> callQueueInfoVOS = callQueueMapper.selectInfoByOpenId(shopId, openId, DateUtil.today(), queueId); List<CallQueueInfoVO> callQueueInfoVOS = callQueueMapper.selectInfoByOpenId(shopId, openId, DateUtil.date().toString("yyyy-MM-dd"), queueId);
if (callQueueInfoVOS.isEmpty()) { 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); TbShopInfo shopInfo = shopInfoMapper.selectByPrimaryKey(shopId);
HashMap<String, Object> data = new HashMap<>(); HashMap<String, Object> data = new HashMap<>();
@@ -176,7 +176,7 @@ public class TbCallServiceImpl implements TbCallService {
// .eq(TbCallQueue::getPhone, takeNumberDTO.getPhone()) // .eq(TbCallQueue::getPhone, takeNumberDTO.getPhone())
.eq(TbCallQueue::getOpenId, subMsgDTO.getOpenId()) .eq(TbCallQueue::getOpenId, subMsgDTO.getOpenId())
.eq(TbCallQueue::getShopId, subMsgDTO.getShopId()) .eq(TbCallQueue::getShopId, subMsgDTO.getShopId())
.eq(TbCallQueue::getCreateDay, DateUtil.today()) .eq(TbCallQueue::getCreateDay, DateUtil.date().toString("yyyy-MM-dd"))
.in(TbCallQueue::getState, 0, 1) .in(TbCallQueue::getState, 0, 1)
.ne(TbCallQueue::getIsPostpone, 2) .ne(TbCallQueue::getIsPostpone, 2)
.eq(TbCallQueue::getCallTableId, queue.getCallTableId()).count(); .eq(TbCallQueue::getCallTableId, queue.getCallTableId()).count();