From f91feae7adadd6c92dbd49ffcd2358a6b8abfaf4 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 29 十一月 2024 15:21:08 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeCardOperate.java | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeCardOperate.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeCardOperate.java
index 21e51cb..428f765 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeCardOperate.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeCardOperate.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.dy.common.po.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Positive;
@@ -17,7 +18,7 @@
/**
* @author ZhuBaoMin
* @date 2024-01-18 19:10
- * @LastEditTime 2024-01-18 19:10
+ * @LastEditTime 2024-02-02 16:00
* @Description
*/
@@ -58,6 +59,7 @@
*/
@Schema(description = "鍗＄墖浣欓", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@Length(message = "鍗＄墖浣欓涓嶅皬浜巤min}", min = 0)
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Float money;
/**
@@ -65,6 +67,7 @@
*/
@Schema(description = "绯荤粺浣欓", requiredMode = Schema.RequiredMode.REQUIRED)
@Length(message = "绯荤粺浣欓涓嶅皬浜巤min}", min = 0)
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Float systemBalance;
/**
@@ -72,6 +75,7 @@
*/
@Schema(description = "浜ゆ槗閲戦", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@Length(message = "浜ゆ槗閲戦涓嶅皬浜巤min}", min = 0)
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Float tradeAmount;
/**
@@ -79,6 +83,7 @@
*/
@Schema(description = "姘翠环", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@Length(message = "姘翠环涓嶅皬浜巤min}", min = 0)
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Float price;
/**
@@ -93,13 +98,23 @@
*/
@Schema(description = "璧犻�侀噾棰�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@Length(message = "璧犻�侀噾棰濅笉灏忎簬{min}", min = 0)
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Float gift;
+
+ /**
+ * 杩旇繕閲戦;琛ユ墸鎿嶄綔鏃惰繑杩樼殑閲戦
+ */
+ @Schema(description = "杩旇繕閲戦", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @Length(message = "杩旇繕閲戦涓嶅皬浜巤min}", min = 0)
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ private Float refundAmount;
/**
* 闈炰氦鏄撻噾棰�;琛ュ崱閲戦銆佽ˉ鎵ｉ噾棰濄�佸墿浣欓噾棰濓紙瑙ｉ攣锛�
*/
@Schema(description = "闈炰氦鏄撻噾棰�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@Length(message = "闈炰氦鏄撻噾棰濅笉灏忎簬{min}", min = 0)
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Float noTradeAmount;
/**
@@ -135,4 +150,10 @@
*/
@Schema(description = "鎿嶄綔鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
private Date operateDt;
+
+ /**
+ * 鎿嶄綔鏄惁鏈夋晥
+ */
+ @Length(message = "鎿嶄綔鏈夋晥鎬т笉澶т簬{max}锛屼笉灏忎簬{min}", min = 1, max = 2)
+ private Byte operateValid;
}
\ No newline at end of file
--
Gitblit v1.8.0