Pre Merge pull request !148 from 卖瓜猹/fix_bug_branch
commit
ebab005856
|
|
@ -67,7 +67,7 @@ public class DiscountActivityBaseVO {
|
||||||
@JsonIgnore
|
@JsonIgnore
|
||||||
public boolean isDiscountPercentValid() {
|
public boolean isDiscountPercentValid() {
|
||||||
return ObjectUtil.notEqual(discountType, PromotionDiscountTypeEnum.PERCENT.getType())
|
return ObjectUtil.notEqual(discountType, PromotionDiscountTypeEnum.PERCENT.getType())
|
||||||
|| (discountPercent != null && discountPercent >= 1 && discountPercent<= 99);
|
|| (discountPercent != null && discountPercent / 100 >= 1 && discountPercent / 100 <= 99);
|
||||||
}
|
}
|
||||||
|
|
||||||
@AssertTrue(message = "优惠金额不能为空")
|
@AssertTrue(message = "优惠金额不能为空")
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue