From 75a07add94de712bef83ee8c35f7daee0bd58daf Mon Sep 17 00:00:00 2001 From: SongZhang <2064194730@qq.com> Date: Sat, 14 Sep 2024 17:01:05 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=8E=92=E9=98=9F=E5=8F=96=E5=8F=B7=20?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8F=AB=E5=8F=B7=E7=8A=B6=E6=80=81=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/TbCallTableController.java | 8 ++++++++ .../system/cashierservice/entity/TbCallQueue.java | 10 +++++++++- .../cashierservice/service/TbCallService.java | 2 ++ .../service/impl/TbCallServiceImpl.java | 13 +++++++++++++ 4 files changed, 32 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/controller/TbCallTableController.java b/src/main/java/com/chaozhanggui/system/cashierservice/controller/TbCallTableController.java index a80ebd3..3615389 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/controller/TbCallTableController.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/controller/TbCallTableController.java @@ -55,4 +55,12 @@ public class TbCallTableController { return Result.successWithData(tbCallService.cancel(cancelCallQueueDTO)); } + @GetMapping("state") + public Result getState( + @RequestParam String openId, + @RequestParam Integer shopId + ) { + return Result.successWithData(tbCallService.getState(openId, shopId)); + } + } diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbCallQueue.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbCallQueue.java index a57512d..70d8b85 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbCallQueue.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbCallQueue.java @@ -106,6 +106,11 @@ public class TbCallQueue implements Serializable { */ private String callNum; + /** + * 创建年月日 + */ + private String createDay; + @TableField(exist = false) private static final long serialVersionUID = 1L; @@ -138,7 +143,8 @@ public class TbCallQueue implements Serializable { && (this.getOpenId() == null ? other.getOpenId() == null : this.getOpenId().equals(other.getOpenId())) && (this.getSubState() == null ? other.getSubState() == null : this.getSubState().equals(other.getSubState())) && (this.getConfirmTime() == null ? other.getConfirmTime() == null : this.getConfirmTime().equals(other.getConfirmTime())) - && (this.getCallNum() == null ? other.getCallNum() == null : this.getCallNum().equals(other.getCallNum())); + && (this.getCallNum() == null ? other.getCallNum() == null : this.getCallNum().equals(other.getCallNum())) + && (this.getCreateDay() == null ? other.getCreateDay() == null : this.getCreateDay().equals(other.getCreateDay())); } @Override @@ -163,6 +169,7 @@ public class TbCallQueue implements Serializable { result = prime * result + ((getSubState() == null) ? 0 : getSubState().hashCode()); result = prime * result + ((getConfirmTime() == null) ? 0 : getConfirmTime().hashCode()); result = prime * result + ((getCallNum() == null) ? 0 : getCallNum().hashCode()); + result = prime * result + ((getCreateDay() == null) ? 0 : getCreateDay().hashCode()); return result; } @@ -190,6 +197,7 @@ public class TbCallQueue implements Serializable { sb.append(", subState=").append(subState); sb.append(", confirmTime=").append(confirmTime); sb.append(", callNum=").append(callNum); + sb.append(", createDay=").append(createDay); sb.append(", serialVersionUID=").append(serialVersionUID); sb.append("]"); return sb.toString(); diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/TbCallService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/TbCallService.java index d81ff43..e9100db 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/TbCallService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/TbCallService.java @@ -11,4 +11,6 @@ public interface TbCallService { Object getAllInfo(Integer shopId); Object cancel(CancelCallQueueDTO cancelCallQueueDTO); + + Object getState(String openId, Integer shopId); } 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 8995f12..961eaad 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 @@ -77,7 +77,9 @@ public class TbCallServiceImpl implements TbCallService { TbCallQueue callQueue = callQueueService.lambdaQuery() .eq(TbCallQueue::getPhone, takeNumberDTO.getPhone()) + .eq(TbCallQueue::getOpenId, takeNumberDTO.getOpenId()) .eq(TbCallQueue::getShopId, takeNumberDTO.getShopId()) + .eq(TbCallQueue::getCreateDay, DateUtil.today()) .in(TbCallQueue::getState, 0, 1) .eq(TbCallQueue::getCallTableId, takeNumberDTO.getCallTableId()).one(); if (callQueue != null) { @@ -90,6 +92,7 @@ public class TbCallServiceImpl implements TbCallService { callQueue.setShopId(shopInfo.getId()); callQueue.setShopName(shopInfo.getShopName()); callQueue.setCallNum(getCallNumber(takeNumberDTO.getShopId(), callTable)); + callQueue.setCreateDay(DateUtil.today()); return callQueueService.save(callQueue); } @@ -111,4 +114,14 @@ public class TbCallServiceImpl implements TbCallService { .set(TbCallQueue::getCallTime, DateUtil.date()) .set(TbCallQueue::getState, -1).update(); } + + + @Override + public Object getState(String openId, Integer shopId) { + return callQueueService.lambdaQuery() + .eq(TbCallQueue::getOpenId, openId) + .eq(TbCallQueue::getCreateDay, DateUtil.today()) + .eq(TbCallQueue::getShopId, shopId) + .one(); + } }