From 9486766c806fe1d9e082b2fd02ea1cc558f1b443 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 08 五月 2025 09:21:57 +0800
Subject: [PATCH] bug修改
---
cloud-server-other/src/main/java/com/dsh/other/entity/SiteBooking.java | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 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 ab1717b..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
@@ -8,6 +8,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
@@ -73,12 +74,14 @@
*/
@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;
/**
* 预约人
@@ -102,6 +105,7 @@
*/
@TableField("payTime")
@ApiModelProperty("支付时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date payTime;
/**
* 支付金额
@@ -149,6 +153,7 @@
* 取消时间
*/
@TableField("cancelTime")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date cancelTime;
/**
* 第三方取消退款流水号
@@ -164,7 +169,7 @@
* 添加时间
*/
@TableField("insertTime")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date insertTime;
@TableField("nextName")
@ApiModelProperty("场地名称")
@@ -185,4 +190,22 @@
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