From ee1800e3988e4913f5328c2cba07735fb4d06eff Mon Sep 17 00:00:00 2001 From: zhubaomin <zhubaomin> Date: 星期五, 06 六月 2025 17:30:37 +0800 Subject: [PATCH] 操作回调开卡附加充值部分 --- pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeRechargeHistory.java | 44 ++++++++++++++++++++++---------------------- 1 files changed, 22 insertions(+), 22 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 a364faa..63a8902 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; @@ -16,8 +17,8 @@ /** * @author ZhuBaoMin - * @date 2023/12/7 20:33 - * @LastEditTime 2023/12/7 20:33 + * @date 2025-06-06 10:34 + * @LastEditTime 2025-06-06 10:34 * @Description */ @@ -31,98 +32,97 @@ @ToString @NoArgsConstructor @AllArgsConstructor -@Schema(name = "姘村崱鍏呭�煎巻鍙插疄浣�") public class SeRechargeHistory implements BaseEntity { - public static final long serialVersionUID = 202312080812001L; + public static final long serialVersionUID = 202401151519002L; /** * 涓婚敭 */ @JSONField(serializeUsing= ObjectWriterImplToString.class) @TableId(type = IdType.INPUT) - @Schema(description = "瀹炰綋id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) private Long id; /** * 姘村崱ID */ - @Schema(description = "姘村崱ID", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - //@NotBlank(message = "姘村崱ID涓嶈兘涓虹┖") - //private String cardnum; @NotNull(message = "姘村崱ID涓嶈兘涓虹┖") private Long cardid; /** * 鍐滄埛ID */ - @Schema(description = "鍐滄埛ID", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - //@NotBlank(message = "鍐滄埛ID涓嶈兘涓虹┖") - //private String clientnum; @NotNull(message = "鍐滄埛ID涓嶈兘涓虹┖") private Long clientid; /** * 鍗$墖浣欓 */ - @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; /** * 鍏呭�奸噾棰� */ - @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; /** * 璧犻�侀噾棰� */ - @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 afterrecharge; /** * 浠樻鏂瑰紡缂栧彿 */ - @Schema(description = "浠樻鏂瑰紡缂栧彿", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @Length(message = "浠樻鏂瑰紡缂栧彿涓嶅ぇ浜巤max}锛屼笉灏忎簬{min}", min = 1, max = 4) private Long paymentid; /** * 姘翠环 */ - @Schema(description = "姘翠环", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @Length(message = "姘翠环涓嶅皬浜巤min}", min = 0) + @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" ) private Float price; /** * 澶囨敞淇℃伅 */ - @Schema(description = "澶囨敞", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @Length(message = "澶囨敞闀垮害灏忎簬{max}瀛�", min = 1, max = 200) private String remarks; /** - * 鎿嶄綔浜虹紪鍙� + * 鎿嶄綔浜篒D */ - @Schema(description = "鎿嶄綔浜虹紪鍙�", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @Positive(message = "鎿嶄綔浜虹紪鍙峰繀椤讳负澶т簬0鐨勬暣鏁�") + @Positive(message = "鎿嶄綔浜篒D蹇呴』涓哄ぇ浜�0鐨勬暣鏁�") private Long operator; /** * 鎿嶄綔鏃堕棿 */ - @Schema(description = "鎿嶄綔鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED) private Date operatedt; + /** + * 鎿嶄綔鏄惁鏈夋晥 + */ + @Length(message = "鎿嶄綔鏈夋晥鎬т笉澶т簬{max}锛屼笉灏忎簬{min}", min = 1, max = 2) + private Byte operateValid; + + /** + * 璁㈠崟鍙� + */ + private String orderNo; + } \ No newline at end of file -- Gitblit v1.8.0