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/SeRecharge.java | 35 ++++++++++++++++++++++-------------
1 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeRecharge.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeRecharge.java
index d9fd9da..b65d57b 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeRecharge.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeRecharge.java
@@ -6,8 +6,8 @@
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.NotBlank;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Positive;
import lombok.*;
@@ -28,7 +28,7 @@
@Schema(name = "姘村崱鍏呭�煎疄浣�")
public class SeRecharge implements BaseEntity {
- public static final long serialVersionUID = 20231191728001L;
+ public static final long serialVersionUID = 202401151519001L;
/**
* 涓婚敭
@@ -39,18 +39,22 @@
private Long id;
/**
- * 姘村崱缂栧彿
+ * 姘村崱ID
*/
- @Schema(description = "姘村崱缂栧彿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @NotBlank(message = "姘村崱缂栧彿涓嶈兘涓虹┖")
- private String cardnum;
+ @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)
- @NotBlank(message = "鍐滄埛缂栧彿涓嶈兘涓虹┖")
- private String clientnum;
+ @Schema(description = "鍐滄埛ID", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ //@NotBlank(message = "鍐滄埛ID涓嶈兘涓虹┖")
+ //private String clientnum;
+ @NotNull(message = "鍐滄埛ID涓嶈兘涓虹┖")
+ private Long clientid;
/**
* 鍗＄墖浣欓
@@ -58,6 +62,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;
/**
@@ -66,6 +71,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;
/**
@@ -73,6 +79,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;
/**
@@ -80,6 +87,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;
/**
@@ -94,6 +102,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;
/**
@@ -104,10 +113,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;
/**
--
Gitblit v1.8.0