From 7963ac8294c7a042032dce0647b9d72d24ee578f Mon Sep 17 00:00:00 2001 From: wood chen Date: Tue, 15 Apr 2025 00:18:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=B7=E6=A0=BC=E5=A4=84?= =?UTF-8?q?=E7=90=86=E9=80=BB=E8=BE=91=EF=BC=8C=E6=96=B0=E5=A2=9E=E6=B5=AE?= =?UTF-8?q?=E7=82=B9=E6=95=B0=E6=AF=94=E8=BE=83=E5=87=BD=E6=95=B0=E4=BB=A5?= =?UTF-8?q?=E6=8F=90=E9=AB=98=E4=BB=B7=E6=A0=BC=E6=AF=94=E8=BE=83=E7=9A=84?= =?UTF-8?q?=E5=87=86=E7=A1=AE=E6=80=A7=E3=80=82=E5=90=8C=E6=97=B6=E9=87=8D?= =?UTF-8?q?=E6=9E=84=E4=BA=86=E4=B8=B4=E6=97=B6=E5=AD=97=E6=AE=B5=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E9=80=BB=E8=BE=91=EF=BC=8C=E7=AE=80=E5=8C=96=E4=BA=86?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=BB=93=E6=9E=84=EF=BC=8C=E6=8F=90=E5=8D=87?= =?UTF-8?q?=E4=BA=86=E5=8F=AF=E8=AF=BB=E6=80=A7=E5=92=8C=E7=BB=B4=E6=8A=A4?= =?UTF-8?q?=E6=80=A7=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/handlers/prices.go | 89 +++++++++++++++------------ backend/handlers/rates/price_rates.go | 17 +++-- 2 files changed, 63 insertions(+), 43 deletions(-) diff --git a/backend/handlers/prices.go b/backend/handlers/prices.go index 65903c2..8d93012 100644 --- a/backend/handlers/prices.go +++ b/backend/handlers/prices.go @@ -2,6 +2,7 @@ package handlers import ( "fmt" + "math" "net/http" "strconv" "time" @@ -107,6 +108,13 @@ func GetPrices(c *gin.Context) { func ProcessPrice(price models.Price, existingPrice *models.Price, isAdmin bool, username string) (models.Price, bool, error) { // 如果是更新操作且存在现有记录 if existingPrice != nil { + // 使用更精确的浮点数比较函数 + priceEqual := func(a, b float64) bool { + // 使用epsilon值进行浮点数比较，考虑到价格通常精确到小数点后4位 + epsilon := 0.00001 + return math.Abs(a-b) < epsilon + } + // 检查价格是否有变化 if isAdmin { // 管理员直接更新主字段，检查是否有实际变化 @@ -115,8 +123,8 @@ func ProcessPrice(price models.Price, existingPrice *models.Price, isAdmin bool, existingPrice.BillingType == price.BillingType && existingPrice.ChannelType == price.ChannelType && existingPrice.Currency == price.Currency && - existingPrice.InputPrice == price.InputPrice && - existingPrice.OutputPrice == price.OutputPrice && + priceEqual(existingPrice.InputPrice, price.InputPrice) && + priceEqual(existingPrice.OutputPrice, price.OutputPrice) && existingPrice.PriceSource == price.PriceSource { // 没有变化，不需要更新 return *existingPrice, false, nil @@ -149,47 +157,51 @@ func ProcessPrice(price models.Price, existingPrice *models.Price, isAdmin bool, return *existingPrice, true, nil } else { // 普通用户更新临时字段，检查是否有实际变化 - // 创建临时值的指针 - modelPtr := &price.Model - modelTypePtr := &price.ModelType - billingTypePtr := &price.BillingType - channelTypePtr := &price.ChannelType - currencyPtr := &price.Currency - inputPricePtr := &price.InputPrice - outputPricePtr := &price.OutputPrice - priceSourcePtr := &price.PriceSource - // 检查临时字段与现有主字段是否相同 - if (existingPrice.Model == price.Model && - existingPrice.ModelType == price.ModelType && - existingPrice.BillingType == price.BillingType && - existingPrice.ChannelType == price.ChannelType && - existingPrice.Currency == price.Currency && - existingPrice.InputPrice == price.InputPrice && - existingPrice.OutputPrice == price.OutputPrice && - existingPrice.PriceSource == price.PriceSource) || - // 或者检查临时字段与现有临时字段是否相同 - (existingPrice.TempModel != nil && *existingPrice.TempModel == price.Model && - existingPrice.TempModelType != nil && *existingPrice.TempModelType == price.ModelType && - existingPrice.TempBillingType != nil && *existingPrice.TempBillingType == price.BillingType && - existingPrice.TempChannelType != nil && *existingPrice.TempChannelType == price.ChannelType && - existingPrice.TempCurrency != nil && *existingPrice.TempCurrency == price.Currency && - existingPrice.TempInputPrice != nil && *existingPrice.TempInputPrice == price.InputPrice && - existingPrice.TempOutputPrice != nil && *existingPrice.TempOutputPrice == price.OutputPrice && - existingPrice.TempPriceSource != nil && *existingPrice.TempPriceSource == price.PriceSource) { - // 没有变化，不需要更新 + // 先检查与主字段比较是否有变化 + hasChanges := false + + if existingPrice.Model != price.Model || + existingPrice.ModelType != price.ModelType || + existingPrice.BillingType != price.BillingType || + existingPrice.ChannelType != price.ChannelType || + existingPrice.Currency != price.Currency || + !priceEqual(existingPrice.InputPrice, price.InputPrice) || + !priceEqual(existingPrice.OutputPrice, price.OutputPrice) || + existingPrice.PriceSource != price.PriceSource { + hasChanges = true + } + + // 如果与主字段有变化，再检查与临时字段比较是否有变化 + if hasChanges && existingPrice.TempModel != nil { + // 检查是否与已有的临时字段相同 + if *existingPrice.TempModel == price.Model && + (existingPrice.TempModelType == nil || *existingPrice.TempModelType == price.ModelType) && + (existingPrice.TempBillingType == nil || *existingPrice.TempBillingType == price.BillingType) && + (existingPrice.TempChannelType == nil || *existingPrice.TempChannelType == price.ChannelType) && + (existingPrice.TempCurrency == nil || *existingPrice.TempCurrency == price.Currency) && + (existingPrice.TempInputPrice == nil || priceEqual(*existingPrice.TempInputPrice, price.InputPrice)) && + (existingPrice.TempOutputPrice == nil || priceEqual(*existingPrice.TempOutputPrice, price.OutputPrice)) && + (existingPrice.TempPriceSource == nil || *existingPrice.TempPriceSource == price.PriceSource) { + // 与之前提交的临时值相同，不需要更新 + hasChanges = false + } + } + + // 如果没有实际变化，直接返回 + if !hasChanges { return *existingPrice, false, nil } // 有变化，更新临时字段 - existingPrice.TempModel = modelPtr - existingPrice.TempModelType = modelTypePtr - existingPrice.TempBillingType = billingTypePtr - existingPrice.TempChannelType = channelTypePtr - existingPrice.TempCurrency = currencyPtr - existingPrice.TempInputPrice = inputPricePtr - existingPrice.TempOutputPrice = outputPricePtr - existingPrice.TempPriceSource = priceSourcePtr + existingPrice.TempModel = &price.Model + existingPrice.TempModelType = &price.ModelType + existingPrice.TempBillingType = &price.BillingType + existingPrice.TempChannelType = &price.ChannelType + existingPrice.TempCurrency = &price.Currency + existingPrice.TempInputPrice = &price.InputPrice + existingPrice.TempOutputPrice = &price.OutputPrice + existingPrice.TempPriceSource = &price.PriceSource existingPrice.Status = "pending" existingPrice.UpdatedBy = &username @@ -212,7 +224,6 @@ func ProcessPrice(price models.Price, existingPrice *models.Price, isAdmin bool, return price, false, err } return price, true, nil - } } diff --git a/backend/handlers/rates/price_rates.go b/backend/handlers/rates/price_rates.go index 8d4d992..831adec 100644 --- a/backend/handlers/rates/price_rates.go +++ b/backend/handlers/rates/price_rates.go @@ -51,12 +51,12 @@ func GetPriceRates(c *gin.Context) { if price.Currency == "USD" { // 如果是美元，除以2 - inputRate = price.InputPrice / 2 - outputRate = price.OutputPrice / 2 + inputRate = round(price.InputPrice/2, 2) + outputRate = round(price.OutputPrice/2, 2) } else { // 如果是人民币或其他货币，除以14 - inputRate = price.InputPrice / 14 - outputRate = price.OutputPrice / 14 + inputRate = round(price.InputPrice/14, 2) + outputRate = round(price.OutputPrice/14, 2) } // 创建当前价格的PriceRate @@ -104,3 +104,12 @@ func GetPriceRates(c *gin.Context) { func ClearRatesCache() { database.GlobalCache.Delete("price_rates") } + +// round 四舍五入到指定小数位 +func round(num float64, precision int) float64 { + precision10 := float64(1) + for i := 0; i < precision; i++ { + precision10 *= 10 + } + return float64(int(num*precision10+0.5)) / precision10 +}