Browse Source

Merge branch 'hotfix/fix_edb_calculate_tbz' into debug

xyxie 6 months ago
parent
commit
9e9d3d2d3d

+ 1 - 1
models/edb_data_calculate_hbz.go

@@ -297,6 +297,6 @@ func HbzDiv(current, pre float64) string {
 	currentVal := decimal.NewFromFloat(current)
 	preVal := decimal.NewFromFloat(pre)
 	val, _ := currentVal.Sub(preVal).Div(preVal).Float64()
-	valStr := decimal.NewFromFloat(val).RoundCeil(4).String() //utils.SubFloatToString(val, 4)
+	valStr := decimal.NewFromFloat(val).Round(4).String() //utils.SubFloatToString(val, 4)
 	return valStr
 }

+ 1 - 1
models/edb_data_calculate_hcz.go

@@ -327,6 +327,6 @@ func HczDiv(current, pre float64) string {
 	currentVal := decimal.NewFromFloat(current)
 	preVal := decimal.NewFromFloat(pre)
 	val, _ := currentVal.Sub(preVal).Float64()
-	valStr := decimal.NewFromFloat(val).RoundCeil(4).String() //utils.SubFloatToString(val, 4)
+	valStr := decimal.NewFromFloat(val).Round(4).String() //utils.SubFloatToString(val, 4)
 	return valStr
 }

+ 1 - 1
models/edb_data_calculate_tbz.go

@@ -323,7 +323,7 @@ func TbzDiv(a, b float64) string {
 		bf := decimal.NewFromFloat(b)
 		val, _ := af.Div(bf).Float64()
 		val = val - 1
-		valStr = decimal.NewFromFloat(val).RoundCeil(4).String()
+		valStr = decimal.NewFromFloat(val).Round(4).String()
 	} else {
 		valStr = "0"
 	}

+ 1 - 1
models/edb_data_calculate_tcz.go

@@ -445,6 +445,6 @@ func TczSub(a, b float64) string {
 	bf := decimal.NewFromFloat(b)
 	val, _ := af.Sub(bf).Float64()
 	//valStr := utils.SubFloatToString(val, 4)
-	valStr := decimal.NewFromFloat(val).RoundCeil(4).String()
+	valStr := decimal.NewFromFloat(val).Round(4).String()
 	return valStr
 }