deving

internal/logic/strategy/rule/roe.go

@@ -9,7 +9,7 @@ import (
 )
 
 var (
-	MinRoe = 0
+	MinRoe float64 = 0
 )
 
 type Roe struct {
@@ -26,20 +26,15 @@ func NewRoe() *Roe {
 
 func (r *Roe) Run(code string) *types.RuleResult {
 
-	var data []models.StockDaily
-	impl.DBService.Where("ts_code = ?", code).Order("trade_date desc").Limit(LastDay).Find(&data)
-
-	check := true
-	for _, row := range data {
-		if row.Close < MinPrice {
-			check = false
-			break
-		}
+	var data models.StockFinaIndicator
+	err := impl.DBService.Where("ts_code = ?", code).Order("period desc").Limit(1).First(&data).Error
+	if err != nil {
+		return &types.RuleResult{Key: r.Key, Name: r.Name, Score: -1, Desc: "最近无财报，无ROE值！"}
 	}
 
-	if !check {
-		return &types.RuleResult{Key: r.Key, Name: r.Name, Score: -1, Desc: fmt.Sprintf("最近%d天, 有价格低于%.2f", LastDay, MinPrice)}
+	if data.Roe < MinRoe {
+		return &types.RuleResult{Key: r.Key, Name: r.Name, Score: -1, Desc: fmt.Sprintf("ROE=%.2f 低于%.2f", data.Roe, MinRoe)}
 	}
 
-	return &types.RuleResult{Key: r.Key, Name: r.Name, Score: 1, Desc: fmt.Sprintf("最近%d天, 价格均高于%.2f", LastDay, MinPrice)}
+	return &types.RuleResult{Key: r.Key, Name: r.Name, Score: 1, Desc: fmt.Sprintf("ROE=%.2f 高于%.2f", data.Roe, MinRoe)}
 }