From 0be32a3805e1430b82b5bded8bd23946e274fa84 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期三, 06 十一月 2024 14:27:35 +0800
Subject: [PATCH] 优化虚拟卡占用逻辑，占用时写入取水口编号，解除占用时清空虚拟卡编号；工单使用的4个表
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeRechargeHistory.java | 36 ++++++++++++++++++++++++++----------
1 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeRechargeHistory.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeRechargeHistory.java
index 680d892..09e5094 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeRechargeHistory.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeRechargeHistory.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;
@@ -33,7 +34,7 @@
@AllArgsConstructor
@Schema(name = "姘村崱鍏呭�煎巻鍙插疄浣�")
public class SeRechargeHistory implements BaseEntity {
- public static final long serialVersionUID = 202312080812001L;
+ public static final long serialVersionUID = 202401151519002L;
/**
* 涓婚敭
@@ -44,17 +45,21 @@
private Long id;
/**
- * 姘村崱缂栧彿
+ * 姘村崱ID
*/
- @Schema(description = "姘村崱缂栧彿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @Length(message = "姘村崱缂栧彿涓嶅皬浜巤min}", min = 1)
+ @Schema(description = "姘村崱ID", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ //@NotBlank(message = "姘村崱ID涓嶈兘涓虹┖")
+ //private String cardnum;
+ @NotNull(message = "姘村崱ID涓嶈兘涓虹┖")
private Long cardid;
/**
- * 鍐滄埛缂栧彿
+ * 鍐滄埛ID
*/
- @Schema(description = "鍐滄埛缂栧彿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @Length(message = "鍐滄埛缂栧彿涓嶅皬浜巤min}", min = 1)
+ @Schema(description = "鍐滄埛ID", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ //@NotBlank(message = "鍐滄埛ID涓嶈兘涓虹┖")
+ //private String clientnum;
+ @NotNull(message = "鍐滄埛ID涓嶈兘涓虹┖")
private Long clientid;
/**
@@ -63,6 +68,7 @@
@Schema(description = "鍗＄墖浣欓", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@NotNull(message = "鍗＄墖浣欓涓嶈兘涓虹┖")
@Length(message = "鍗＄墖浣欓涓嶅皬浜巤min}", min = 0)
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Float money;
/**
@@ -71,6 +77,7 @@
@Schema(description = "鍏呭�奸噾棰�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@NotNull(message = "鍏呭�奸噾棰濅笉鑳戒负绌�")
@Length(message = "鍏呭�奸噾棰濅笉灏忎簬{min}", min = 0)
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Float amount;
/**
@@ -78,6 +85,7 @@
*/
@Schema(description = "璧犻�侀噾棰�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@Length(message = "璧犻�侀噾棰濅笉灏忎簬{min}", min = 0)
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Float gift;
/**
@@ -85,6 +93,7 @@
*/
@Schema(description = "鍏呭�煎悗浣欓", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@Length(message = "鍏呭�煎悗浣欓涓嶅皬浜巤min}", min = 0)
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Float afterrecharge;
/**
@@ -99,6 +108,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;
/**
@@ -109,10 +119,10 @@
private String remarks;
/**
- * 鎿嶄綔浜虹紪鍙�
+ * 鎿嶄綔浜篒D
*/
- @Schema(description = "鎿嶄綔浜虹紪鍙�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @Positive(message = "鎿嶄綔浜虹紪鍙峰繀椤讳负澶т簬0鐨勬暣鏁�")
+ @Schema(description = "鎿嶄綔浜篒D", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @Positive(message = "鎿嶄綔浜篒D蹇呴』涓哄ぇ浜�0鐨勬暣鏁�")
private Long operator;
/**
@@ -121,4 +131,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