From ad31648c6f7a8bff1f7ccdf84b76006b9ffb78f8 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 17 Jul 2021 15:59:10 +0800
Subject: [PATCH] 1.	新增套餐中有效和无效的操作 2.	会员修改门店功能 3.	套餐新增编辑次数功能 4.	计算是否为赠送的条件为，全部为赠送金额购买且支付金额大于0 5.	打印小票功能调整间距，和收银人 6.	PC端服务单新增划扣金额展示

---
 zq-erp/src/main/java/com/matrix/system/hive/bean/SysProjServices.java |   51 +++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 45 insertions(+), 6 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..628ca52 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,12 +37,14 @@
     /**
      * 订单创建时间
      */
-    @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;
     /**
      * 订单划扣时间
      */
+    @JsonFormat(pattern = DateUtil.DATE_FORMAT_MM, timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
     private Date consumeTime;
 
     /**
@@ -62,9 +64,7 @@
      * 床位
      */
     private Long bedId;
-    /**
-     * 床位
-     */
+
     private Long companyId;
 
     /**
@@ -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