From 7d6ac6e33d142c7961e40211ae61af5ac2e425b9 Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Thu, 19 Sep 2024 15:24:58 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=8E=92=E9=98=9F=E5=8F=96=E5=8F=B7=20?=
 =?UTF-8?q?=E5=8F=96=E5=8F=B7=E6=A0=A1=E9=AA=8C=E6=89=8B=E6=9C=BA=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/cashierservice/entity/dto/TakeNumberDTO.java      | 5 ++++-
 .../cashierservice/service/impl/TbCallServiceImpl.java       | 4 +---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/dto/TakeNumberDTO.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/dto/TakeNumberDTO.java
index 1f19574..a560f29 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/dto/TakeNumberDTO.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/dto/TakeNumberDTO.java
@@ -4,12 +4,15 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
 
 @EqualsAndHashCode(callSuper = true)
 @Data
 public class TakeNumberDTO extends BaseCallTableDTO{
-    @NotNull
+    @NotBlank
+    @Pattern(regexp = "^1\\d{10}$|^(0\\d{2,3}-?|\\(0\\d{2,3}\\))?[1-9]\\d{4,7}(-\\d{1,8})?$",message = "手机号码格式错误")
     private String phone;
     private String note;
     private String name;
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 47ff1fc..01d13e0 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
@@ -102,9 +102,7 @@ public class TbCallServiceImpl implements TbCallService {
         callQueue.setCreateDay(DateUtil.today());
         boolean save = callQueueService.save(callQueue);
         // 打印排号票信息
-        if (save) {
-            mQUtils.printCallNumTicket(callQueue.getId(), callQueue.getShopId());
-        }
+        mQUtils.printCallNumTicket(callQueue.getId(), callQueue.getShopId());
         return save;
     }