From c560f1a14ae1fc468d90e50e6a32d805295875da Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 01 九月 2025 15:35:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-other/src/main/java/com/dsh/other/entity/SiteBooking.java | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 58 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..2653f40 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,13 @@
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.math.BigDecimal;
import java.util.Date;
+import java.util.List;
/**
* @author zhibing.pu
@@ -61,24 +65,35 @@
@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=手动支付）
@@ -89,11 +104,14 @@
* 支付时间
*/
@TableField("payTime")
+ @ApiModelProperty("支付时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date payTime;
/**
* 支付金额
*/
@TableField("payMoney")
+ @ApiModelProperty("支付金额")
private Double payMoney;
/**
* 优惠券id
@@ -104,6 +122,7 @@
* 状态（0=待支付，1=待核销，2=已到店，3=已完成，4=已过期，5=已取消）
*/
@TableField("status")
+ @ApiModelProperty("0=待支付，1=待核销，2=已到店，3=已完成，4=已过期，5=已取消")
private Integer status;
/**
* 第三方支付流水号
@@ -134,6 +153,7 @@
* 取消时间
*/
@TableField("cancelTime")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date cancelTime;
/**
* 第三方取消退款流水号
@@ -149,5 +169,43 @@
* 添加时间
*/
@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;
+ /**
+ * 分账流水号
+ */
+ @TableField("fenzhangNo")
+ private String fenzhangNo;
+ /**
+ * 分账业务号 存值表明已分账 未存表明未分账
+ */
+ @TableField("fenzhangOrderNo")
+ private String fenzhangOrderNo;
+ // 分账金额
+ @TableField("fenzhangAmount")
+ private BigDecimal fenzhangAmount;
+ // 分账回退流水号
+ @TableField("fenzhangRefundNo")
+ private String fenzhangRefundNo;
}
--
Gitblit v1.7.1