From ab2879bbcb846256cc182198b9c04e50fbc276c1 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 26 Jan 2021 14:15:42 +0800
Subject: [PATCH] 1、新增消息推送提醒 2、修改业绩计算bug
---
zq-erp/src/main/java/com/matrix/system/hive/bean/SysProjServices.java | 45 ++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 42 insertions(+), 3 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/bean/SysProjServices.java b/zq-erp/src/main/java/com/matrix/system/hive/bean/SysProjServices.java
index 46dd6a0..11bca7e 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/bean/SysProjServices.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/bean/SysProjServices.java
@@ -37,7 +37,7 @@
/**
* 订单创建时间
*/
- @JsonFormat(pattern = DateUtil.DATE_FORMAT_MM, timezone = "GTM+8")
+ @JsonFormat(pattern = DateUtil.DATE_FORMAT_MM, timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
private Date createTime;
/**
@@ -232,6 +232,14 @@
* 床位名称
*/
private String bedName;
+ /**
+ * 评价
+ */
+ private String comment;
+ /**
+ * 评价回复
+ */
+ private String reply;
/**
* 商机
*/
@@ -241,6 +249,12 @@
* 服务预计时长
*/
private Integer totalTime;
+
+
+ /**
+ * 到时提醒次数
+ */
+ private Integer overtimeNotice;
@@ -255,6 +269,22 @@
* 门店
*/
private SysShopInfo shopInfo;
+
+ public String getComment() {
+ return comment;
+ }
+
+ public void setComment(String comment) {
+ this.comment = comment;
+ }
+
+ public String getReply() {
+ return reply;
+ }
+
+ public void setReply(String reply) {
+ this.reply = reply;
+ }
@Extend
private String shopName;
@@ -289,14 +319,14 @@
/**
* 扩展属性-预约查询开始时间
*/
- @JsonFormat(pattern = DateUtil.DATE_FORMAT_MM, timezone = "GTM+8")
+ @JsonFormat(pattern = DateUtil.DATE_FORMAT_MM, timezone = "GMT+8")
@DateTimeFormat(pattern = DateUtil.DATE_FORMAT_MM)
private Date beginTime;
/**
* 扩展属性-预约查询结束时间
*/
- @JsonFormat(pattern = DateUtil.DATE_FORMAT_MM, timezone = "GTM+8")
+ @JsonFormat(pattern = DateUtil.DATE_FORMAT_MM, timezone = "GMT+8")
@DateTimeFormat(pattern = DateUtil.DATE_FORMAT_MM)
private Date closureTime;
@@ -306,6 +336,15 @@
@Extend
private String pageFlae;
+
+ public Integer getOvertimeNotice() {
+ return overtimeNotice;
+ }
+
+ public void setOvertimeNotice(Integer overtimeNotice) {
+ this.overtimeNotice = overtimeNotice;
+ }
+
public String getPageFlae() {
return pageFlae;
}
--
Gitblit v1.9.1