From e129be76e8b85bf6b4f797e804ddbe8b19a607b9 Mon Sep 17 00:00:00 2001 From: SongZhang <2064194730@qq.com> Date: Wed, 18 Sep 2024 10:20:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E5=8F=B7=E4=BF=AE=E6=94=B9=E5=8F=AB?= =?UTF-8?q?=E5=8F=B7=E7=8A=B6=E6=80=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/ysk/cashier/dto/calltable/TakeNumberDTO.java | 1 - .../cn/ysk/cashier/service/impl/app/TbCallServiceImpl.java | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/dto/calltable/TakeNumberDTO.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/calltable/TakeNumberDTO.java index 2bd60490..f45768cc 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/dto/calltable/TakeNumberDTO.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/calltable/TakeNumberDTO.java @@ -9,7 +9,6 @@ import javax.validation.constraints.NotNull; @EqualsAndHashCode(callSuper = true) @Data public class TakeNumberDTO extends BaseCallTableDTO{ - @NotNull private Integer userId; @NotEmpty private String phone; diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/app/TbCallServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/app/TbCallServiceImpl.java index 8d080be7..7b118f2f 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/app/TbCallServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/app/TbCallServiceImpl.java @@ -268,10 +268,12 @@ public class TbCallServiceImpl implements TbCallService { callQueue.setCancelTime(DateUtil.date().toInstant()); break; case 0: + callQueue.setState((byte) 0); + break; + case 1: if (callQueue.getSubState().equals(0)) { throw new BadRequestException("当前用户未订阅微信提醒"); } - callQueue.setState((byte) 1); callQueue.setCallCount(callQueue.getCallCount() + 1); callQueue.setCallTime(DateUtil.date().toInstant());