From abba1aff81da3cc9d74d75f64cbd48d25716aec3 Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Fri, 12 Mar 2021 19:19:10 +0800
Subject: [PATCH] 1、增加对于套餐中的剩余读片量、有效开始日期、结束日期的加密 2、增加扣费过程中对于剩余读片量的加密 3、为下载私有云数据库增加合同与明细的查询Feign接口 4、修改合作商数据库（影像版API）的合同与明细的查询bug
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/ProductOrderDetail.java | 31 ++++++++++++++++++++++++++++++-
1 files changed, 30 insertions(+), 1 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/ProductOrderDetail.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/ProductOrderDetail.java
index 46ac6c3..6a8f53d 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/ProductOrderDetail.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/ProductOrderDetail.java
@@ -50,10 +50,14 @@
@NotEmpty(message = "产品/明细名称不能为空")
private String proName;
/**
- * 产品类型 0试用 1正式
+ * 产品类型 0试用 1正式 3 自定义
*/
@NotNull(message = "产品类型不能为空")
private Integer proType;
+ /**
+ * 产品使用期限限制 1有限制，0 无限制
+ */
+ private Integer termType;
/**
* 是否共享 0否 1是
*/
@@ -66,10 +70,25 @@
@NotEmpty(message = "是否删除，1删除，0未删除不能为空")
private Boolean isDel;
/**
+ * 产品的读片总量
+ */
+ @NotNull(message = "产品的读片总量")
+ private Integer orderAilightCount;
+ /**
+ * 产品的报告总量
+ */
+ @NotNull(message = "产品的报告总量")
+ private Integer orderRecordCount;
+ /**
* 读片量
*/
@NotNull(message = "读片量不能为空")
private Integer ailightCount;
+ /**
+ * 读片量加密串
+ */
+ private String ailightCountEncryption;
+
/**
* 报告量
*/
@@ -81,11 +100,21 @@
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date proBegintime;
/**
+ * 有效的开始时间加密串
+ */
+ private String proBegintimeEncryption;
+
+ /**
* 有效的结束时间
*/
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date proEndtime;
/**
+ * 有效的结束时间加密串
+ */
+ private String proEndtimeEncryption;
+
+ /**
* 状态，1启用，0停用
*/
private Boolean enabled;
--
Gitblit v1.8.0