From 6fd4bdff55620c562e0a22eee3c95924951b04a4 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Thu, 24 Sep 2020 14:10:28 +0800
Subject: [PATCH] Merge branch 'pay_master' of ssh://192.168.2.240:29418/kidgrow-microservices-platform into pay_master
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/SaasClientPay.java | 36 +++++++++++++++++++++++++++++++++---
1 files changed, 33 insertions(+), 3 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..3b524f6 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
@@ -30,6 +30,7 @@
public class SaasClientPay {
private static final long serialVersionUID = 1L;
+ @TableId(value = "id",type = IdType.UUID)
private String id;
/**
* 诊断医生所在科室
@@ -49,6 +50,13 @@
* 创建医院名称
*/
private String createHospitalName;
+ /**
+ * 医生id
+ */
+ private String createDoctorId; /**
+ * 医生姓名
+ */
+ private String createDoctorName;
/**
* 金额 （单位为分）
*/
@@ -76,6 +84,17 @@
*/
@NotEmpty(message = "关联诊断记录ID不能为空")
private String diaId;
+
+ /**
+ * 诊断人姓名
+ */
+ @NotEmpty(message = "关联诊断记录ID不能为空")
+ private String diaName;
+ /**
+ * 孩子的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