diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeSale/StoreSaleResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeSale/StoreSaleResVO.java index 5ab623cf5..dd38d9dec 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeSale/StoreSaleResVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeSale/StoreSaleResVO.java @@ -77,8 +77,6 @@ public class StoreSaleResVO { private Integer quantity; @ApiModelProperty(value = "总金额") private BigDecimal amount; - @ApiModelProperty(value = "其它优惠") - private BigDecimal otherDiscount; } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeSale/StoreSaleVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeSale/StoreSaleVO.java index 1589e6f41..23d415826 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeSale/StoreSaleVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeSale/StoreSaleVO.java @@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.Valid; +import javax.validation.constraints.DecimalMin; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import java.math.BigDecimal; @@ -74,8 +75,10 @@ public class StoreSaleVO { private String sn; @NotNull(message = "销售单价不能为空!") @ApiModelProperty(value = "销售单价", required = true) + @DecimalMin(value = "0.00", inclusive = false, message = "销售单价必须大于0") private BigDecimal price; @ApiModelProperty(value = "给客户优惠后单价") + @DecimalMin(value = "0.00", inclusive = false, message = "优惠后单价必须大于0") private BigDecimal discountedPrice; @ApiModelProperty(value = "数量", required = true) @NotNull(message = "数量不能为空!") @@ -83,8 +86,6 @@ public class StoreSaleVO { @NotNull(message = "总金额不能为空!") @ApiModelProperty(value = "总金额", required = true) private BigDecimal amount; - @ApiModelProperty(value = "其它优惠") - private BigDecimal otherDiscount; } } diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeSale/StoreSaleDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeSale/StoreSaleDTO.java index 107167118..fe817e838 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeSale/StoreSaleDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeSale/StoreSaleDTO.java @@ -62,8 +62,6 @@ public class StoreSaleDTO { private Integer quantity; @ApiModelProperty(value = "总金额") private BigDecimal amount; - @ApiModelProperty(value = "其它优惠") - private BigDecimal otherDiscount; } } diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeSale/StoreSaleResDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeSale/StoreSaleResDTO.java index d887aeebe..33c67561b 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeSale/StoreSaleResDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeSale/StoreSaleResDTO.java @@ -77,8 +77,6 @@ public class StoreSaleResDTO { private Integer quantity; @ApiModelProperty(value = "总金额") private BigDecimal amount; - @ApiModelProperty(value = "其它优惠") - private BigDecimal otherDiscount; } }