Explorar o código

fix:修复利润曲线为没有值时也参与计算的bug

Roc hai 1 ano
pai
achega
07b6f59bd6
Modificáronse 1 ficheiros con 3 adicións e 2 borrados
  1. 3 2
      logic/profit_chart_info.go

+ 3 - 2
logic/profit_chart_info.go

@@ -469,7 +469,7 @@ func ProfitChartChartData(baseDataList []*models.EdbDataList, futureGoodEdbInfoM
 				tmpRealDateTime := findDateTime
 				tmpFindDataValue, tmpIsFind := edbDataMap[childFutureGoodEdbInfoId][findDateTime.Format(utils.FormatDate)]
 
-				if tmpIsFind && tmpFindDataValue > 0 {
+				if tmpIsFind && tmpFindDataValue != 0 {
 					calculateMap[childFutureGoodEdbInfoId] = tmpFindDataValue
 					if maxDate.IsZero() || maxDate.Before(tmpRealDateTime) {
 						maxDate = tmpRealDateTime
@@ -518,7 +518,8 @@ func ProfitChartChartData(baseDataList []*models.EdbDataList, futureGoodEdbInfoM
 			}
 			//yDataMap[n] = calVal
 			//xEdbInfoIdList = append(xEdbInfoIdList, n)
-			yDataMap[tmpN], _ = decimal.NewFromFloat(calVal).Round(4).Float64()
+			calVal, _ = decimal.NewFromFloat(calVal).Round(4).Float64()
+			yDataMap[tmpN] = calVal
 			xEdbInfoIdList = append(xEdbInfoIdList, tmpN)
 			findDataList = append(findDataList, calVal)
 		}