From 35edc2fddbd90831ef7bf79043871c9d8d50003d Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 29 八月 2023 19:00:46 +0800
Subject: [PATCH] fix
---
model/purchase/purchase.go | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/model/purchase/purchase.go b/model/purchase/purchase.go
index 4506751..d9f7acd 100644
--- a/model/purchase/purchase.go
+++ b/model/purchase/purchase.go
@@ -46,18 +46,19 @@
type WholeDiscountType int
const (
+ WholeDiscountTypeDefault WholeDiscountType = 0 //鏃犳姌鎵�
WholeDiscountTypePercent WholeDiscountType = 1 //鐧惧垎姣旈檷浠�
WholeDiscountTypeDiscount WholeDiscountType = 2 //鐩存帴闄嶄环
)
func (wdt WholeDiscountType) IsValid(totalPrice, value decimal.Decimal) bool {
- if wdt != WholeDiscountTypePercent && wdt != WholeDiscountTypeDiscount {
+ if wdt != WholeDiscountTypePercent && wdt != WholeDiscountTypeDiscount && wdt != WholeDiscountTypeDefault {
return false
}
- if wdt == WholeDiscountTypeDiscount && value.GreaterThanOrEqual(totalPrice) {
+ if wdt == WholeDiscountTypeDiscount && value.GreaterThan(totalPrice) {
return false
}
- if wdt == WholeDiscountTypePercent && totalPrice.Mul(value).Div(decimal.NewFromInt(100)).GreaterThanOrEqual(totalPrice) {
+ if wdt == WholeDiscountTypePercent && totalPrice.Mul(value).Div(decimal.NewFromInt(100)).GreaterThan(totalPrice) {
return false
}
return true
@@ -74,7 +75,7 @@
if pat != PriceAdjustmentTypeAdd && pat != PriceAdjustmentTypeSub {
return false
}
- if pat == PriceAdjustmentTypeSub && value.GreaterThanOrEqual(totalPrice) {
+ if pat == PriceAdjustmentTypeSub && value.GreaterThan(totalPrice) {
return false
}
return true
--
Gitblit v1.8.0