修改有色数据同步

models/data_manage/edb_data_ys.go

@@ -51,8 +51,8 @@ func ModifyEdbDataSmm(edbCode, dataTime string, value float64) (err error) {
 func RefreshEdbDataByYs(edbInfoId int, edbCode, startDate, endDate string) (err error) {
 	var condition string
 	var pars []interface{}
-	condition += " AND base_from_smm_data=? "
-	pars = append(pars, edbCode)
+	condition += " AND base_from_smm_index_id=? "
+	pars = append(pars, edbInfoId)
 
 	if startDate!="" {
 		condition += " AND data_time>=? "

services/data/edb_info.go

@@ -381,18 +381,20 @@ func RefreshDataFromCalculateAll() (err error) {
 			}
 		} else if source == utils.DATA_SOURCE_CALCULATE_BP {
 			calculateBp, err := data_manage.GetEdbInfoCalculateBpDetail(edbInfoId)
-			if err != nil {
+			if err != nil && err.Error() != utils.ErrNoRow() {
 				return errors.New("GetEdbInfoCalculateBpDetail Err:" + err.Error())
 			}
-			fromEdbInfo, err := data_manage.GetEdbInfoById(calculateBp.FromEdbInfoId)
-			if err != nil {
-				return errors.New("GetEdbInfoById Err:" + err.Error())
-			}
-			startDate := time.Now().AddDate(-2, -2, 0).Format(utils.FormatDate)
-			endDate := time.Now().Format(utils.FormatDate)
-			err = data_manage.RefreshCalculateBp(edbInfoId, fromEdbInfo, calculateBp.EdbCode, startDate, endDate)
-			if err != nil {
-				return errors.New("RefreshCalculateTbz Err:" + err.Error())
+			if calculateBp != nil {
+				fromEdbInfo, err := data_manage.GetEdbInfoById(calculateBp.FromEdbInfoId)
+				if err != nil {
+					return errors.New("GetEdbInfoById Err:" + err.Error())
+				}
+				startDate := time.Now().AddDate(-2, -2, 0).Format(utils.FormatDate)
+				endDate := time.Now().Format(utils.FormatDate)
+				err = data_manage.RefreshCalculateBp(edbInfoId, fromEdbInfo, calculateBp.EdbCode, startDate, endDate)
+				if err != nil {
+					return errors.New("RefreshCalculateTbz Err:" + err.Error())
+				}
 			}
 		} else {
 			msg := "刷新失败,无效的指标渠道:source:" + strconv.Itoa(source) + " EdbCode:" + v.EdbCode