From a830a73fd10a21e3793c79a35be4e532de124c6f Mon Sep 17 00:00:00 2001 From: nickchange <126672920+nickchange@users.noreply.github.com> Date: 星期二, 17 十月 2023 17:25:16 +0800 Subject: [PATCH] 10.17.1 --- cloud-server-other/src/main/java/com/dsh/other/entity/SiteBooking.java | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/cloud-server-other/src/main/java/com/dsh/other/entity/SiteBooking.java b/cloud-server-other/src/main/java/com/dsh/other/entity/SiteBooking.java index 42512db..cbdb629 100644 --- a/cloud-server-other/src/main/java/com/dsh/other/entity/SiteBooking.java +++ b/cloud-server-other/src/main/java/com/dsh/other/entity/SiteBooking.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; @@ -61,24 +63,33 @@ @TableField("appUserId") private Integer appUserId; /** + * 预约时段 + */ + @TableField("times") + private String times; + /** * 预约开始时间 */ @TableField("startTime") + @ApiModelProperty("预约开始时间") private Date startTime; /** * 预约结束 */ @TableField("endTime") + @ApiModelProperty("预约结束时间") private Date endTime; /** * 预约人 */ @TableField("booker") + @ApiModelProperty("预约人") private String booker; /** * 联系方式 */ @TableField("phone") + @ApiModelProperty("联系方式") private String phone; /** * 支付方式(1=微信,2=支付宝,3=玩湃比,4=手动支付) @@ -89,11 +100,13 @@ * 支付时间 */ @TableField("payTime") + @ApiModelProperty("支付时间") private Date payTime; /** * 支付金额 */ @TableField("payMoney") + @ApiModelProperty("支付金额") private Double payMoney; /** * 优惠券id @@ -104,6 +117,7 @@ * 状态(0=待支付,1=待核销,2=已到店,3=已完成,4=已过期,5=已取消) */ @TableField("status") + @ApiModelProperty("0=待支付,1=待核销,2=已到店,3=已完成,4=已过期,5=已取消") private Integer status; /** * 第三方支付流水号 @@ -149,5 +163,20 @@ * 添加时间 */ @TableField("insertTime") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") private Date insertTime; + @TableField("nextName") + @ApiModelProperty("场地名称") + private String nextName; + @TableField("isHalf") + @ApiModelProperty("半场 是否半场 1是 2否") + private Integer isHalf; + @TableField("halfName") + @ApiModelProperty("半场名称 ") + private String halfName; + @TableField("goType") + private Integer goType; + @TableField("money") + + private String money; } -- Gitblit v1.7.1