From 4351e71d782741143a98f86f6648acd16689165f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 27 May 2022 19:48:02 +0800
Subject: [PATCH] Merge branch 'developer' into hive2.0

---
 zq-erp/src/main/java/com/matrix/system/hive/bean/SysProjServices.java |  100 +++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 91 insertions(+), 9 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 e668ea8..a974e87 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
@@ -1,7 +1,8 @@
 package com.matrix.system.hive.bean;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.matrix.core.anotations.Extend;
-import com.matrix.system.hive.plugin.util.DateUtils;
+import com.matrix.core.tools.DateUtil;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
@@ -36,11 +37,14 @@
     /**
      * 订单创建时间
      */
+    @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;
 
     /**
@@ -60,15 +64,29 @@
      * 床位
      */
     private Long bedId;
-    /**
-     * 床位
-     */
+
     private Long companyId;
 
     /**
      * 主美疗师
      */
     private Long beauticianId;
+
+    /**
+     * 员工编号(美容顾问) 下单人id
+     */
+    private Long staffId;
+    /**
+     * 收银员姓名
+     */
+    @Extend
+    private String cashierName;
+
+
+    /**
+     * 收银员
+     */
+    private Long cashierId;
 
     /**
      * 仪器
@@ -154,7 +172,7 @@
     /**
      * 预约时间
      */
-    @DateTimeFormat(pattern = DateUtils.DATE_FORMAT_MM)
+    @DateTimeFormat(pattern = DateUtil.DATE_FORMAT_MM)
     private Date yyTime;
 
     /**
@@ -170,12 +188,12 @@
     /**
      * 开始时间
      */
-    @DateTimeFormat(pattern = DateUtils.DATE_FORMAT_MM)
+    @DateTimeFormat(pattern = DateUtil.DATE_FORMAT_MM)
     private Date startTime;
     /**
      * 结束时间
      */
-    @DateTimeFormat(pattern = DateUtils.DATE_FORMAT_MM)
+    @DateTimeFormat(pattern = DateUtil.DATE_FORMAT_MM)
     private Date endTime;
     /**
      * 超时时间
@@ -230,6 +248,14 @@
      * 床位名称
      */
     private String bedName;
+     /**
+     * 评价
+     */
+    private String comment;
+     /**
+     * 评价回复
+     */
+    private String reply;
     /**
      * 商机
      */
@@ -239,6 +265,12 @@
      * 服务预计时长
      */
     private Integer totalTime;
+
+
+    /**
+     * 到时提醒次数
+     */
+    private Integer overtimeNotice;
 
 
 
@@ -253,6 +285,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;
@@ -287,13 +335,15 @@
     /**
      * 扩展属性-预约查询开始时间
      */
-    @DateTimeFormat(pattern = DateUtils.DATE_FORMAT_MM)
+    @JsonFormat(pattern = DateUtil.DATE_FORMAT_MM, timezone = "GMT+8")
+    @DateTimeFormat(pattern = DateUtil.DATE_FORMAT_MM)
     private Date beginTime;
 
     /**
      * 扩展属性-预约查询结束时间
      */
-    @DateTimeFormat(pattern = DateUtils.DATE_FORMAT_MM)
+    @JsonFormat(pattern = DateUtil.DATE_FORMAT_MM, timezone = "GMT+8")
+    @DateTimeFormat(pattern = DateUtil.DATE_FORMAT_MM)
     private Date closureTime;
 
     /**
@@ -302,6 +352,38 @@
     @Extend
     private String pageFlae;
 
+    public Long getStaffId() {
+        return staffId;
+    }
+
+    public void setStaffId(Long staffId) {
+        this.staffId = staffId;
+    }
+
+    public String getCashierName() {
+        return cashierName;
+    }
+
+    public void setCashierName(String cashierName) {
+        this.cashierName = cashierName;
+    }
+
+    public Long getCashierId() {
+        return cashierId;
+    }
+
+    public void setCashierId(Long cashierId) {
+        this.cashierId = cashierId;
+    }
+
+    public Integer getOvertimeNotice() {
+        return overtimeNotice;
+    }
+
+    public void setOvertimeNotice(Integer overtimeNotice) {
+        this.overtimeNotice = overtimeNotice;
+    }
+
     public String getPageFlae() {
         return pageFlae;
     }

--
Gitblit v1.9.1