From e0395c5454534e7cf657b10045d00e4042dc7e71 Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Mon, 28 Sep 2020 15:51:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/pay_master' into pay_master
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/SaasClientPay.java | 42 ++++++++++++++++++++++++++++++++++++------
1 files changed, 36 insertions(+), 6 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/SaasClientPay.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/SaasClientPay.java
index bf59e61..c8788d2 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/SaasClientPay.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/SaasClientPay.java
@@ -11,6 +11,7 @@
import org.hibernate.validator.constraints.NotEmpty;
import org.springframework.format.annotation.DateTimeFormat;
+import javax.validation.constraints.NotNull;
import java.util.Date;
/**
@@ -30,10 +31,12 @@
public class SaasClientPay {
private static final long serialVersionUID = 1L;
+ @TableId(value = "id",type = IdType.UUID)
private String id;
/**
* 诊断医生所在科室
*/
+ @NotEmpty(message = "科室的名称不能为空")
private String createHospitalDepartment;
/**
* 科室的唯一标识
@@ -43,21 +46,31 @@
/**
* 创建医院的唯一标识
*/
- @NotEmpty(message = "创建医院的唯一标识不能为空")
+ @NotNull(message = "创建医院的唯一标识不能为空")
private Long createHospitalId;
/**
* 创建医院名称
*/
+ @NotEmpty(message = "医院名称不能为空")
private String createHospitalName;
+ /**
+ * 医生id
+ */
+ @NotEmpty(message = "医生id不能为空")
+ private String createDoctorId; /**
+ * 医生姓名
+ */
+ @NotEmpty(message = "医生姓名不能为空")
+ private String createDoctorName;
/**
* 金额 （单位为分）
*/
- @NotEmpty(message = "金额 （单位为分）不能为空")
+
private Integer payPrice;
/**
* 内部订单号
*/
- @NotEmpty(message = "内部订单号不能为空")
+
private String outTradeNo;
/**
* 支付完成时间
@@ -76,6 +89,12 @@
*/
@NotEmpty(message = "关联诊断记录ID不能为空")
private String diaId;
+
+ /**
+ * 孩子的id
+ */
+ @NotEmpty(message = "孩子的id")
+ private String childId;
/**
* 支付宝交易号 微信支付订单号
*/
@@ -87,16 +106,27 @@
/**
* 支付给喜高的费用
*/
- private String payKidgrow;
+ private Integer payKidgrow;
/**
- * 支付给客户的费用
+ 支付给客户的费用
*/
- private String payCustom;
+ private Integer payCustom;
/**
* 支付状态
*/
private Boolean type;
+ private String childName;
+ /**
+ * 孩子的出生日期
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "Asia/Shanghai")
+ private Date childBirthday;
+ /**
+ * 孩子的性别
+ */
+ private Integer childSex;
+
@JsonSerialize(
using = ToStringSerializer.class
)
--
Gitblit v1.8.0