取号打票

eladmin-system/src/main/java/cn/ysk/cashier/dto/CallNumPrintDTO.java

@@ -0,0 +1,11 @@
+package cn.ysk.cashier.dto;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class CallNumPrintDTO {
+    private Integer callQueueId;
+    private Integer shopId;
+}

eladmin-system/src/main/java/cn/ysk/cashier/dto/calltable/TakeNumberDTO.java

@@ -5,12 +5,14 @@ import lombok.EqualsAndHashCode;
 
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
 
 @EqualsAndHashCode(callSuper = true)
 @Data
 public class TakeNumberDTO extends BaseCallTableDTO{
     private Integer userId;
     @NotEmpty
+    @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;

eladmin-system/src/main/java/cn/ysk/cashier/dto/shoptable/AddCartDTO.java

@@ -11,7 +11,6 @@ import javax.validation.constraints.NotNull;
 public class AddCartDTO {
     @NotEmpty
     private String masterId;
-    private Integer vipUserId;
     @NotNull
     private Integer productId;
     @NotNull