From a730987f2a3eb600b3c0d90961aa6ac7925b902e Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Mon, 28 Sep 2020 15:49:38 +0800
Subject: [PATCH] 1.增加小数类型处理公共类 2.开通支付修改互斥条件和查询参数 3.修改单次支付的开通金额统一单位为分
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/SaasClientPay.java | 23 ++++++++++++++++++++---
1 files changed, 20 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..2e7263d 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;
/**
* 诊断医生所在科室
@@ -77,6 +78,11 @@
@NotEmpty(message = "关联诊断记录ID不能为空")
private String diaId;
/**
+ * 孩子的id
+ */
+ @NotEmpty(message = "孩子的id")
+ private String childId;
+ /**
* 支付宝交易号 微信支付订单号
*/
private String tradeNo;
@@ -87,16 +93,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