From 640ff18d2d7f4be02ddb7f8f75e899f05545eb98 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 05 二月 2024 11:56:52 +0800
Subject: [PATCH] 更新bug修改
---
cloud-server-other/src/main/java/com/dsh/other/entity/SiteBooking.java | 86 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 86 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 0a3c761..cbfc476 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,9 +4,12 @@
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;
+import java.util.List;
/**
* @author zhibing.pu
@@ -20,6 +23,11 @@
*/
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
+ /**
+ * 业务流水号
+ */
+ @TableField("orderNo")
+ private String orderNo;
/**
* 省
*/
@@ -51,30 +59,80 @@
@TableField("siteId")
private Integer siteId;
/**
+ * 用户id
+ */
+ @TableField("appUserId")
+ private Integer appUserId;
+ /**
+ * 预约时段
+ */
+ @TableField("times")
+ private String times;
+ /**
* 预约开始时间
*/
@TableField("startTime")
+ @ApiModelProperty("预约开始时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date startTime;
/**
* 预约结束
*/
@TableField("endTime")
+ @ApiModelProperty("预约结束时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date endTime;
/**
* 预约人
*/
@TableField("booker")
+ @ApiModelProperty("预约人")
private String booker;
/**
* 联系方式
*/
@TableField("phone")
+ @ApiModelProperty("联系方式")
private String phone;
+ /**
+ * 支付方式（1=微信，2=支付宝，3=玩湃比，4=手动支付）
+ */
+ @TableField("payType")
+ private Integer payType;
+ /**
+ * 支付时间
+ */
+ @TableField("payTime")
+ @ApiModelProperty("支付时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date payTime;
+ /**
+ * 支付金额
+ */
+ @TableField("payMoney")
+ @ApiModelProperty("支付金额")
+ private Double payMoney;
+ /**
+ * 优惠券id
+ */
+ @TableField("userCouponId")
+ private Long userCouponId;
/**
* 状态（0=待支付，1=待核销，2=已到店，3=已完成，4=已过期，5=已取消）
*/
@TableField("status")
+ @ApiModelProperty("0=待支付，1=待核销，2=已到店，3=已完成，4=已过期，5=已取消")
private Integer status;
+ /**
+ * 第三方支付流水号
+ */
+ @TableField("payOrderNo")
+ private String payOrderNo;
+ /**
+ * 手动支付操作用户id
+ */
+ @TableField("payUserId")
+ private Integer payUserId;
/**
* 取消用户id
*/
@@ -94,7 +152,13 @@
* 取消时间
*/
@TableField("cancelTime")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date cancelTime;
+ /**
+ * 第三方取消退款流水号
+ */
+ @TableField("refundOrderNo")
+ private String refundOrderNo;
/**
* 状态（1=正常，2=冻结，3=删除）
*/
@@ -104,5 +168,27 @@
* 添加时间
*/
@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;
+ @TableField(exist = false)
+ private String storePhone;
+ @TableField(exist = false)
+ private List<Integer> sid;
+ @TableField(exist = false)
+ private List<Integer> rid;
+ @TableField("addType")
+ private Integer addType;
}
--
Gitblit v1.7.1