Merge branch 'pool/588' into debug

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)
 		}

models/edb_info.go

@@ -701,10 +701,18 @@ func GetChartPredictEdbInfoDataListByConfList(predictEdbConfList []*PredictEdbCo
 				return
 			}
 		}
-		//startDate = dataEndTime.AddDate(0, 0, 1)
-		if startDate.Before(dataEndTime) {
-			startDate = dataEndTime
+
+		// 下一个规则的开始日期
+		{
+			lenPredictEdbInfoData := len(predictEdbInfoData)
+			if lenPredictEdbInfoData > 0 {
+				tmpDataEndTime, _ := time.ParseInLocation(utils.FormatDate, predictEdbInfoData[lenPredictEdbInfoData-1].DataTime, time.Local)
+				if startDate.Before(tmpDataEndTime) {
+					startDate = tmpDataEndTime
+				}
+			}
 		}
+
 		if tmpMinValue < minValue {
 			minValue = tmpMinValue
 		}

models/predict_edb_info_rule.go

@@ -134,24 +134,20 @@ func GetChartPredictEdbInfoDataListByRuleTb(edbInfoId int, tbValue float64, dayL
 // @params a float64 去年同期值
 // @params b float64 固定同比增速
 func PredictTbzDiv(a, b float64) (result float64) {
-	if b != 0 {
-		// 去年同期值
-		af := decimal.NewFromFloat(a)
+	// 去年同期值
+	af := decimal.NewFromFloat(a)
 
-		// 同比增速
-		bf := decimal.NewFromFloat(b)
+	// 同比增速
+	bf := decimal.NewFromFloat(b)
 
-		// 默认1
-		cf := decimal.NewFromFloat(1)
+	// 默认1
+	cf := decimal.NewFromFloat(1)
 
-		// 总增速
-		val := bf.Add(cf)
+	// 总增速
+	val := bf.Add(cf)
 
-		// 计算
-		result, _ = val.Mul(af).RoundCeil(4).Float64()
-	} else {
-		result = 0
-	}
+	// 计算
+	result, _ = val.Mul(af).RoundCeil(4).Float64()
 	return
 }