Merge branch '14.2'

services/data/future_good/base_future_good_lib.go

@@ -10,7 +10,6 @@ import (
 	"strings"
 )
 
-
 // AddEdbData 添加指标数据
 func AddEdbData(futureGoodEdbCode string) (resp *models.BaseResponse, err error) {
 	param := make(map[string]interface{})
@@ -31,6 +30,15 @@ func RefreshEdbData(futureGoodEdbInfoId int, futureGoodEdbCode, startDate string
 	return
 }
 
+// RefreshEdbRelation 刷新商品期货指标相关的数据
+func RefreshEdbRelation(futureGoodEdbInfoId int) (resp *models.BaseResponse, err error) {
+	param := make(map[string]interface{})
+	param["FutureGoodEdbInfoId"] = futureGoodEdbInfoId
+	urlStr := `future_good/relation/refresh`
+	resp, err = postRefreshEdbData(param, urlStr)
+	return
+}
+
 // postRefreshEdbData 刷新指标数据
 func postRefreshEdbData(param map[string]interface{}, urlStr string) (resp *models.BaseResponse, err error) {
 	postUrl := utils.EDB_LIB_URL + urlStr

services/data/future_good/future_edb_info.go

@@ -53,5 +53,13 @@ func FutureGoodEdbInfoRefreshAllFromBase(futureGoodEdbInfoList []*future_good.Fu
 			return fmt.Errorf("刷新失败, err:%s", errMsg)
 		}
 	}
+
+	// 刷新商品期货指标相关的数据
+	for _, bv := range futureGoodEdbInfoList {
+		if bv.ParentId == 0 {
+			RefreshEdbRelation(bv.FutureGoodEdbInfoId)
+		}
+	}
+
 	return err
 }