From c42614978ff12013a1eabebd0289b27169a5784f Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期二, 06 五月 2025 17:25:56 +0800 Subject: [PATCH] 1、实现万功能token(0000-0000-1234-9876-5); 2、web端单独实现命令结果等待器,并相应修改相关部分; 3、web端实现透传命令; 4、修改一些不当注释; 5、优化一些代码。 --- pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeClientCard.java | 22 ++++++++++++++++++++-- 1 files changed, 20 insertions(+), 2 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeClientCard.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeClientCard.java index 304f837..075c426 100644 --- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeClientCard.java +++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeClientCard.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.NotBlank; import jakarta.validation.constraints.Positive; @@ -34,7 +35,7 @@ @AllArgsConstructor @Schema(name = "鍐滄埛姘村崱瀹炰綋") public class SeClientCard implements BaseEntity { - public static final long serialVersionUID = 1L; + public static final long serialVersionUID = 202401151518004L; /** * 涓婚敭 @@ -43,6 +44,9 @@ @TableId(type = IdType.INPUT) @Schema(description = "瀹炰綋id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) private Long id; + + @NotBlank(message = "閫氳鍗忚涓嶈兘涓虹┖") + private String protocol; /** * 姘村崱鍦板潃 @@ -69,7 +73,8 @@ * 浣欓 */ @Schema(description = "浣欓", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - private Double money; + @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" ) + private Float money; /** * 鍗$墖鐘舵��;1-姝e父锛�2-宸叉敞閿�锛�3-宸叉寕澶� @@ -78,6 +83,13 @@ @Positive(message = "鍗$墖鐘舵�佸繀椤讳负1鎴�2鎴�3") @Size(min = 1, max = 3) private Byte state; + + /** + * 鍘熸寕澶卞崱ID + */ + @Schema(description = "鍗$墖鐘舵��", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @Positive(message = "鍘熸寕澶卞崱ID蹇呴』涓烘鏁�") + private Long originalCardId; /** * 寮�鍗℃椂闂� @@ -122,6 +134,12 @@ private Date reversaldt; /** + * 琛ユ墸鏃堕棿 + */ + @Schema(description = "琛ユ墸鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + private Date refunddt; + + /** * 娑堣垂鏃堕棿 */ @Schema(description = "娑堣垂鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED) -- Gitblit v1.8.0