From d20acf38c36c11ee4428c3e74a17f5870dc61b51 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期四, 16 十一月 2023 09:51:00 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/SRM
---
model/purchase/purchase.go | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/model/purchase/purchase.go b/model/purchase/purchase.go
index c690479..27de935 100644
--- a/model/purchase/purchase.go
+++ b/model/purchase/purchase.go
@@ -39,13 +39,18 @@
PaidAmount decimal.Decimal `json:"paidAmount" form:"paidAmount" gorm:"type:decimal(12,2);not null;default '';comment:宸蹭粯閲戦"` //宸蹭粯閲戦
}
+func (Purchase) TableName() string {
+ return "srm_purchase"
+}
+
type OrderStatus int
const (
- OrderStatusConfirmed OrderStatus = 1 //宸蹭笅鍗�
- OrderStatusReceived OrderStatus = 2 //宸插埌璐�
+ OrderStatusConfirmed OrderStatus = 1 //寰呯‘璁�
+ OrderStatusReceived OrderStatus = 2 //寰呭叆搴�
OrderStatusStored OrderStatus = 3 //宸插叆搴�
OrderStatusCompleted OrderStatus = 4 //宸插畬鎴�
+ OrderStatusCanceled OrderStatus = 5 //宸插彇娑�
)
type WholeDiscountType int
@@ -94,7 +99,7 @@
func (slf Purchase) CalcRealTotalPrice() decimal.Decimal {
totalPrice := slf.TotalPrice
if slf.WholeDiscountType == WholeDiscountTypePercent {
- totalPrice = totalPrice.Mul(slf.WholeDiscount).Div(decimal.NewFromInt(100))
+ totalPrice = totalPrice.Mul(decimal.NewFromInt(1).Sub(slf.WholeDiscount.Div(decimal.NewFromInt(100))))
} else if slf.WholeDiscountType == WholeDiscountTypeDiscount {
totalPrice = totalPrice.Sub(slf.WholeDiscount)
}
--
Gitblit v1.8.0