feat: 修改兑换码查询

lichong-a · Sep 22, 2024 · 264d0be · 264d0be
1 parent 867149a
commit 264d0be
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/common/domain/src/main/java/org/funcode/portal/server/common/domain/ielts/RedeemCode.java b/common/domain/src/main/java/org/funcode/portal/server/common/domain/ielts/RedeemCode.java
@@ -79,10 +79,10 @@ public class RedeemCode extends BaseEntity {
     @Schema(description = "兑换时间")
     private LocalDateTime redeemTime;
 
-    @ManyToMany(fetch = FetchType.EAGER, mappedBy = "redeemCodes", cascade = {CascadeType.DETACH, CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH})
+    @ManyToMany(fetch = FetchType.EAGER, mappedBy = "redeemCodes")
     private Set<Course> courses;
 
-    @ManyToMany(fetch = FetchType.EAGER, mappedBy = "redeemCodes", cascade = {CascadeType.DETACH, CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH})
+    @ManyToMany(fetch = FetchType.EAGER, mappedBy = "redeemCodes")
     private Set<CourseColumn> courseColumns;
 
     @ManyToOne

diff --git a/...java/org/funcode/portal/server/module/ielts/column/domain/vo/CourseColumnAddOrEditVo.java b/...java/org/funcode/portal/server/module/ielts/column/domain/vo/CourseColumnAddOrEditVo.java
@@ -7,6 +7,7 @@
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.DecimalMin;
+import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
 import lombok.Data;
 import lombok.RequiredArgsConstructor;
@@ -28,11 +29,14 @@ public class CourseColumnAddOrEditVo {
 
     @Schema(description = "专栏ID")
     private Long id;
+    @NotNull(message = "{ielts.domain.vo.CourseColumnAddOrEditVo.title.NotNull}")
     @Size(max = 100, message = "{ielts.domain.vo.CourseColumnAddOrEditVo.title.Size}")
     @Schema(description = "专栏标题")
     private String title;
+    @NotNull(message = "{ielts.domain.vo.CourseColumnAddOrEditVo.status.NotNull}")
     @Schema(description = "专栏状态（0：已下架;1：已上架;2：下架并静止播放）")
     private Integer status;
+    @NotNull(message = "{ielts.domain.vo.CourseColumnAddOrEditVo.price.NotNull}")
     @DecimalMin(value = "0.00", message = "{ielts.domain.vo.CourseColumnAddOrEditVo.price.DecimalMin}")
     @Schema(description = "价格")
     private BigDecimal price;