From e7393ef75b7df2799f627b4707cd8bc4b9d555e2 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 23 十月 2024 16:54:17 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/dto/DtoReissue.java | 36 +++++++++++-------------------------
1 files changed, 11 insertions(+), 25 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/dto/DtoReissue.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/dto/DtoReissue.java
index eb52aa5..0b634e9 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/dto/DtoReissue.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/dto/DtoReissue.java
@@ -1,9 +1,8 @@
package com.dy.pipIrrSell.cardOperate.dto;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.Min;
import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.Positive;
+import jakarta.validation.constraints.NotNull;
import lombok.*;
/**
@@ -28,50 +27,37 @@
@NotBlank(message = "姘村崱鍦板潃涓嶈兘涓虹┖")
private String cardAddr;
- ///**
- // * 鍐滄埛缂栧彿锛屽紑鍗′娇鐢�
- // */
- //@Schema(description = "鍐滄埛缂栧彿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- //private String clientNum;
-
- /**
- * 鍐滄埛ID锛堜富閿級锛屼笉鏄紑鍗℃帴鍙ｄ紶鍏ワ紝鐢卞啘鎴风紪鍙疯幏寰楋紝淇濆瓨寮�鍗¤褰曞拰鍏呭�艰褰曢兘闇�瑕�
- */
- //@Schema(description = "鍐滄埛ID", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- //private Long clientId;
-
/**
* 姘村崱缂栧彿锛屼笉鏄紑鍗℃帴鍙ｄ紶鍏ワ紝鐢卞啘鎴风紪鍙疯幏寰楋紝鍏呭�奸渶瑕�
*/
@Schema(description = "姘村崱缂栧彿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- private String cardNum;
+ @NotNull(message = "姘村崱缂栧彿涓嶈兘涓虹┖")
+ private Long cardNum;
/**
* 閲戦
*/
- @Schema(description = "閲戦", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @Min(value = 0, message="閲戦涓嶈兘灏忎簬0")
- private Float money;
+ //@Schema(description = "閲戦", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ //@Min(value = 0, message="閲戦涓嶈兘灏忎簬0")
+ //private Float money;
/**
* 鍗＄墖璐圭敤
*/
@Schema(description = "鍗＄墖璐圭敤", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @Positive(message = "鍗＄墖璐圭敤蹇呴』涓哄ぇ浜�0鐨勬暣鏁�")
private Integer cardCost;
/**
- * 琛ュ崱閲戦锛屽紑鍗℃椂鍏呭�肩敤
+ * 閫�杩橀噾棰濓紝琛ュ紑鍗℃椂鍏呭�肩敤
*/
- //@Schema(description = "琛ュ崱閲戦", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- //@Min(value = 0, message="琛ュ崱閲戦涓嶈兘灏忎簬0")
- //private Float reissueAmount;
+ @Schema(description = "閫�杩橀噾棰�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ private Float reissueAmount;
/**
* 鏀粯鏂瑰紡缂栧彿
*/
@Schema(description = "鏀粯鏂瑰紡缂栧彿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @Positive(message = "鏀粯鏂瑰紡缂栧彿蹇呴』涓哄ぇ浜�0鐨勬暣鏁�")
+ @NotNull(message = "鏀粯鏂瑰紡涓嶈兘涓虹┖")
private Long paymentId;
/**
@@ -84,6 +70,6 @@
* 鎿嶄綔浜虹紪鍙�
*/
@Schema(description = "鎿嶄綔浜虹紪鍙�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @Positive(message = "鎿嶄綔浜虹紪鍙峰繀椤讳负澶т簬0鐨勬暣鏁�")
+ @NotNull(message = "鎿嶄綔浜轰笉鑳戒负绌�")
private Long operator;
}
--
Gitblit v1.8.0