From 2d3de87d7d4ca8773c187738d66c4dae1165a4d4 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 8 Jun 2022 18:29:50 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E7=A1=AE=E8=AE=A4=E6=9D=A5=E6=AC=BE?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E8=A1=A8=20=E6=97=A5=E6=9C=9Fformat?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/PayConfirmPaymentRecord.java       | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayConfirmPaymentRecord.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayConfirmPaymentRecord.java
index e2e59fda..a7e2d88b 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayConfirmPaymentRecord.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayConfirmPaymentRecord.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -11,6 +12,10 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.validation.constraints.DecimalMax;
+import javax.validation.constraints.NotNull;
 
 /**
   *
@@ -43,6 +48,8 @@ public class PayConfirmPaymentRecord implements Serializable {
      * 创建日期
      */
     @TableField(value = "create_time")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value="创建日期")
     private Date createTime;
 
@@ -57,6 +64,8 @@ public class PayConfirmPaymentRecord implements Serializable {
      * 更新日期
      */
     @TableField(value = "update_time")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value="更新日期")
     private Date updateTime;
 
@@ -78,6 +87,9 @@ public class PayConfirmPaymentRecord implements Serializable {
      * 到账金额
      */
     @TableField(value = "amount_received")
+    @NotNull(message = "到账金额（元）不能为空")
+    @DecimalMax(value = "9999999999.99",message = "到账金额（元）格式错误")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
     @ApiModelProperty(value="到账金额")
     private BigDecimal amountReceived;
 
@@ -86,8 +98,18 @@ public class PayConfirmPaymentRecord implements Serializable {
      */
     @TableField(value = "payment_date")
     @ApiModelProperty(value="到账日期")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @NotNull(message = "到账日期不能为空")
     private Date paymentDate;
 
+    /**
+     * 备注
+     */
+    @TableField(value = "remark")
+    @ApiModelProperty(value="备注")
+    private String remark;
+
     public static final String COL_ID = "id";
 
     public static final String COL_CREATE_BY = "create_by";
@@ -103,4 +125,6 @@ public class PayConfirmPaymentRecord implements Serializable {
     public static final String COL_AMOUNT_RECEIVED = "amount_received";
 
     public static final String COL_PAYMENT_DATE = "payment_date";
+
+    public static final String COL_REMARK = "remark";
 }
\ No newline at end of file