From 47818e4505abc4b6ec9fdbc03dd427d66db37514 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Wed, 22 Jul 2020 19:20:59 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/ConsumptionRecord.java | 29 +++++++++++++++++++++++++----
1 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/ConsumptionRecord.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/ConsumptionRecord.java
index 93ee069..fd7746d 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/ConsumptionRecord.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/ConsumptionRecord.java
@@ -1,9 +1,11 @@
package com.kidgrow.oprationcenter.model;
+import com.baomidou.mybatisplus.annotation.TableId;
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 com.kidgrow.common.model.BaseModel;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -11,6 +13,7 @@
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
+import java.util.Date;
/**
* 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
@@ -26,9 +29,14 @@
@NoArgsConstructor
@AllArgsConstructor
@TableName("consumption_record")
-public class ConsumptionRecord extends SuperModel {
+public class ConsumptionRecord extends BaseModel {
private static final long serialVersionUID = 1L;
-
+ /**
+ * 上次消费记录id（用于退费，扣费）
+ */
+ @TableId
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
/**
* 上次消费记录id（用于退费，扣费）
*/
@@ -64,12 +72,25 @@
* 300 退还预扣
* 301 退还扣费
* 400 义务执行出错
+ * 401 参数为空异常
+ * 402 业务失败
*/
@NotEmpty(message = "业务返回结果不能为空")
- private String businessCode;
+ private Integer businessCode;
/**
* 扣费数量/金额
*/
@NotNull(message = "扣费数量/金额不能为空")
private Integer consumptionCount;
+ /**
+ * 创建时间
+ */
+ @NotNull(message = "创建时间不能为空")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+ /**
+ * 更新时间
+ */
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
}
--
Gitblit v1.8.0