czg_team/cashier-admin-java
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/test' into test

Browse Source
This commit is contained in:
yijiegong
2024-09-14 16:24:36 +08:00
parent b101bac68c 48f82895e7
commit 50dc84efd5
60 changed files with 2301 additions and 329 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
eladmin-system/src/main/java/cn/ysk/cashier/dto/BaseQueryDto.java Normal file
View File

@@ -0,0 +1,36 @@
package cn.ysk.cashier.dto;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
public class BaseQueryDto {
private Integer shopId;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date startTime;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date endTime;
public Integer getShopId() {
return shopId;
}
public void setShopId(Integer shopId) {
this.shopId = shopId;
}
public Date getStartTime() {
return startTime;
}
public void setStartTime(Date startTime) {
this.startTime = startTime;
}
public Date getEndTime() {
return endTime;
}
public void setEndTime(Date endTime) {
this.endTime = endTime;
}
}

13
eladmin-system/src/main/java/cn/ysk/cashier/dto/calltable/BaseCallTableDTO.java Normal file
View File

@@ -0,0 +1,13 @@
package cn.ysk.cashier.dto.calltable;
import lombok.Data;
import javax.validation.constraints.NotNull;
@Data
public class BaseCallTableDTO {
@NotNull
private Integer callTableId;
@NotNull
private Integer shopId;
}

13
eladmin-system/src/main/java/cn/ysk/cashier/dto/calltable/CallQueueDTO.java Normal file
View File

@@ -0,0 +1,13 @@
package cn.ysk.cashier.dto.calltable;
import lombok.Data;
import javax.validation.constraints.NotNull;
@Data
public class CallQueueDTO{
@NotNull
private Integer callQueueId;
@NotNull
private Integer shopId;
}

27
eladmin-system/src/main/java/cn/ysk/cashier/dto/calltable/CallTableDTO.java Normal file
View File

@@ -0,0 +1,27 @@
package cn.ysk.cashier.dto.calltable;
import lombok.Data;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
@Data
public class CallTableDTO {
@NotNull
private Integer shopId;
@NotEmpty
private String name;
private String note;
@NotNull
@Min(1)
private Integer waitTime;
@NotBlank
private String prefix;
@NotNull
@Min(1)
private Integer start;
@Min(1)
private Integer nearNum;
}

15
eladmin-system/src/main/java/cn/ysk/cashier/dto/calltable/TakeNumberDTO.java Normal file
View File

@@ -0,0 +1,15 @@
package cn.ysk.cashier.dto.calltable;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotNull;
@EqualsAndHashCode(callSuper = true)
@Data
public class TakeNumberDTO extends BaseCallTableDTO{
private Integer userId;
private String phone;
private String note;
private String name;
}

15
eladmin-system/src/main/java/cn/ysk/cashier/dto/calltable/UpdateCallQueueDTO.java Normal file
View File

@@ -0,0 +1,15 @@
package cn.ysk.cashier.dto.calltable;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import javax.validation.constraints.NotNull;
@EqualsAndHashCode(callSuper = true)
@Data
@Getter
public class UpdateCallQueueDTO extends CallQueueDTO{
@NotNull
private Byte state;
}

26
eladmin-system/src/main/java/cn/ysk/cashier/dto/calltable/UpdateCallTableDTO.java Normal file
View File

@@ -0,0 +1,26 @@
package cn.ysk.cashier.dto.calltable;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
@Data
public class UpdateCallTableDTO{
@NotNull
private Integer callTableId;
@NotNull
private Integer shopId;
private String name;
private String note;
@Min(1)
private Integer waitTime;
private String prefix;
@Min(1)
private Integer start;
@Min(1)
private Integer nearNum;
}

7
eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopInfoDto.java
View File

@@ -23,6 +23,7 @@ import javax.persistence.Column;
import javax.validation.constraints.NotBlank;
import java.math.BigDecimal;
import java.io.Serializable;
import java.util.List;
/**
* @website https://eladmin.vip
@@ -192,4 +193,10 @@ public class TbShopInfoDto implements Serializable {
private String isReturn;
private String isMemberIn;
private String isMemberReturn;
private Integer isTableFee;
private BigDecimal tableFee;
private List<String> eatModel;
//程序码(零点八零首页)
private String smallQrcode;
private String paymentQrcode;
}

5
eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopTableQueryCriteria.java
View File

@@ -36,4 +36,7 @@ public class TbShopTableQueryCriteria{
@Query
private Integer areaId;
}
@Query
private Long qrcode;
}

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

@@ -20,9 +20,10 @@ public class AddCartDTO {
@NotEmpty
private String tableId;
@NotNull
@Min(0)
@Min(1)
private Integer num;
private boolean isPack;
private boolean isGift;
private Integer cartId;
private String note;
}

15
eladmin-system/src/main/java/cn/ysk/cashier/dto/shoptable/BaseTableDTO.java Normal file
View File

@@ -0,0 +1,15 @@
package cn.ysk.cashier.dto.shoptable;
import lombok.Data;
import org.hibernate.validator.constraints.Range;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
@Data
public class BaseTableDTO {
@NotNull
private Integer shopId;
@NotEmpty
private String tableId;
}

20
eladmin-system/src/main/java/cn/ysk/cashier/dto/shoptable/ChoseCountDTO.java Normal file
View File

@@ -0,0 +1,20 @@
package cn.ysk.cashier.dto.shoptable;
import lombok.Data;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
@Data
public class ChoseCountDTO {
@NotEmpty
private String masterId;
@NotNull
private Integer shopId;
@NotEmpty
private String tableId;
@NotNull
@Min(1)
private Integer num;
}

19
eladmin-system/src/main/java/cn/ysk/cashier/dto/shoptable/ChoseTableDTO.java Normal file
View File

@@ -0,0 +1,19 @@
package cn.ysk.cashier.dto.shoptable;
import lombok.Data;
import javax.validation.constraints.Max;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
@Data
public class ChoseTableDTO {
@NotNull
private Integer shopId;
private Integer orderId;
@NotNull
private String newTableId;
@NotEmpty
private String oldTableId;
}

15
eladmin-system/src/main/java/cn/ysk/cashier/dto/shoptable/ReturnOrderDTO.java Normal file
View File

@@ -0,0 +1,15 @@
package cn.ysk.cashier.dto.shoptable;
import lombok.Data;
import javax.validation.constraints.NotNull;
@Data
public class ReturnOrderDTO {
@NotNull
private Integer cartId;
@NotNull
private Integer shopId;
@NotNull
private Long tableId;
}

28
eladmin-system/src/main/java/cn/ysk/cashier/dto/shoptable/TableGenerateDTO.java Normal file
View File

@@ -0,0 +1,28 @@
package cn.ysk.cashier.dto.shoptable;
import lombok.Data;
import javax.validation.constraints.Max;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
@Data
public class TableGenerateDTO {
@NotNull
private Integer shopId;
@NotEmpty
private String sign;
private Integer areaId;
@Min(1)
@NotNull
private Integer start;
@Min(2)
@Max(1000)
@NotNull
private Integer end;
@NotNull
@Min(1)
private Integer capacity;
private Integer autoClear = 1;
}