From 2f10692d098af93490c46aa561a353fc5870c789 Mon Sep 17 00:00:00 2001
From: 侯瑞军 <411269194@kidgrow.com>
Date: Wed, 31 Mar 2021 18:51:22 +0800
Subject: [PATCH] 优化修复扣费成功后的日志代码，预防bug出现

---
 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysDepartment.java |   75 +++++++++++++++++++++++++++++++++++--
 1 files changed, 70 insertions(+), 5 deletions(-)

diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysDepartment.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysDepartment.java
index 206aa71..7233ebe 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysDepartment.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysDepartment.java
@@ -1,12 +1,18 @@
 package com.kidgrow.usercenter.model;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.kidgrow.common.model.SuperModel;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import org.hibernate.validator.constraints.NotEmpty;
+
+import javax.validation.constraints.NotNull;
+import java.util.Date;
 
 /**
  * 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
@@ -33,22 +39,23 @@
     /**
      * 组织Id
      */
-    @NotEmpty(message = "组织Id不能为空")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long orgId;
     /**
      * 负责的销售代表
      */
-    @NotEmpty(message = "负责的销售代表不能为空")
+    @NotNull(message = "服务代表不能为空")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long serverUserId;
     /**
      * 销售代表的名字
      */
-    @NotEmpty(message = "销售代表的名字不能为空")
+    @NotEmpty(message = "服务代表的名字不能为空")
     private String serverUserName;
     /**
-     * 科室/部门简介
+     * 销售代表电话
      */
-    private String departmentAbout;
+    private String serverUserTel;
     /**
      * 状态，1启用，0停用
      */
@@ -57,4 +64,62 @@
      * 是否删除，1删除，0未删除
      */
     private Boolean isDel;
+    /**
+     * 负责的销售代表
+     */
+    @NotNull(message = "负责的销售代表不能为空")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long saleUserId;
+    /**
+     * 销售代表的名字
+     */
+    @NotEmpty(message = "销售代表的名字不能为空")
+    private String saleUserName;
+    /**
+     * 销售代表电话
+     */
+    private String saleUserTel;
+    /**
+     * 帐号数量,默认6
+     */
+    private Integer accountsCount;
+    /**
+     * 是否单次支付 1是0否
+     */
+    private Boolean isPay;
+    /**
+     * 运动处方 1是0否
+     */
+    private Boolean isHealth;
+
+    /**
+     * 运动处方服务生效时间
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private Date healthBeginTime;
+    /**
+     * 运动处方服务结束时间
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private Date healthEndTime;
+
+    /**
+     * 部门联系人
+     */
+    private String departmentLink;
+
+    /**
+     * 部门联系人电话
+     */
+    private String departmentTel;
+
+    /**
+     * 是否筛查科室 0为否  1 为是
+     */
+    private Byte isScreen;
+    /**
+     * 是否新筛查端 0为否  1 为是
+     */
+    private Byte isNewScreenclient;
+
 }

--
Gitblit v1.8.0