代客下单支持外带用餐模式

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

@@ -3,6 +3,7 @@ package cn.ysk.cashier.dto.shoptable;
 import lombok.Data;
 
 import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 
@@ -17,7 +18,6 @@ public class AddCartDTO {
     private Integer skuId;
     @NotNull
     private Integer shopId;
-    @NotEmpty
     private String tableId;
     @NotNull
     @Min(1)
@@ -26,4 +26,8 @@ public class AddCartDTO {
     private boolean isGift;
     private Integer cartId;
     private String note;
+
+    // 用餐类型
+    @NotBlank
+    private String useType;
 }

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

@@ -17,4 +17,6 @@ public class ChoseCountDTO {
     @NotNull
     @Min(1)
     private Integer num;
+    @NotEmpty
+    private String useType;
 }

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

@@ -16,4 +16,5 @@ public class ChoseTableDTO {
     private String newTableId;
     @NotEmpty
     private String oldTableId;
+
 }

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

@@ -6,12 +6,12 @@ import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 
 @Data
-public class ClearCartDTO {
+    public class ClearCartDTO {
     @NotEmpty
     private String masterId;
-    private Integer vipUserId;
-    @NotNull
-    private Long tableId;
     @NotNull
     private String shopId;
+    @NotEmpty
+    private String useType;
+    private Long tableId;
 }

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

@@ -9,12 +9,12 @@ import javax.validation.constraints.NotNull;
 public class CreateOrderDTO {
     @NotEmpty
     private String masterId;
-    private Integer vipUserId;
     @NotNull
     private Integer shopId;
-    @NotEmpty
     private String tableId;
     private String note;
     private boolean postPay;
     private Integer orderId;
+    @NotEmpty
+    private String useType;
 }

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

@@ -2,8 +2,12 @@ package cn.ysk.cashier.dto.shoptable;
 
 import lombok.Data;
 
+import javax.validation.constraints.NotNull;
+
 @Data
 public class DeleteOrderDTO {
+    @NotNull
     private Integer shopId;
+    @NotNull
     private Integer orderId;
 }

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

@@ -13,7 +13,6 @@ public class PackCartDTO {
     private Integer vipUserId;
     @NotNull
     private Integer shopId;
-    @NotEmpty
     private String tableId;
     @NotNull
     @Range(min = 0, max = 1)

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

@@ -3,6 +3,7 @@ package cn.ysk.cashier.dto.shoptable;
 import lombok.Data;
 import org.bouncycastle.asn1.cmc.PendInfo;
 
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 
@@ -12,9 +13,10 @@ public class PendingDTO {
     @NotNull
     private Integer shopId;
     private String tableId;
-    private Integer vipUserId;
     @NotNull
     private Boolean isPending;
     private Integer orderId;
     private String note;
+    @NotBlank
+    private String useType;
 }

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

@@ -2,6 +2,7 @@ package cn.ysk.cashier.dto.shoptable;
 
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 
@@ -11,6 +12,7 @@ public class RemoveCartDTO {
     private Integer cartId;
     @NotNull
     private Integer shopId;
-    @NotNull
     private Long tableId;
+    @NotBlank
+    private String useType;
 }

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

@@ -19,4 +19,5 @@ public class UpdateVipDTO {
     @NotNull
     @Range(min = 0, max = 1)
     private Integer type;
+
 }