Merge branch 'wecht/template' into debug

services/data/edb_info.go

@@ -1876,7 +1876,7 @@ func RefreshDataFromComTrade(wg *sync.WaitGroup) (err error) {
 			//go utils.SendEmail(utils.APPNAME+"【"+utils.RunMode+"】"+"失败提醒", "RefreshDataFromGl ErrMsg:"+err.Error(), utils.EmailSendToUsers)
 			go alarm_msg.SendAlarmMsg("RefreshDataFromComTrade ErrMsg:"+err.Error(), 3)
 		}
-		//wg.Done()
+		wg.Done()
 	}()
 	var condition string
 	var pars []interface{}
@@ -1922,7 +1922,7 @@ func RefreshDataFromSci(wg *sync.WaitGroup) (err error) {
 			//go utils.SendEmail(utils.APPNAME+"【"+utils.RunMode+"】"+"失败提醒", "RefreshDataFromGl ErrMsg:"+err.Error(), utils.EmailSendToUsers)
 			go alarm_msg.SendAlarmMsg("RefreshDataFromSci ErrMsg:"+err.Error(), 3)
 		}
-		//wg.Done()
+		wg.Done()
 	}()
 	var condition string
 	var pars []interface{}

services/data/future_good/base_future_good_lib.go

@@ -30,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_good_edb_info.go

@@ -61,5 +61,12 @@ func RefreshFutureGoodDataFromThs() (err error) {
 		}
 
 	}
+
+	// 刷新商品期货指标相关的数据
+	for _, bv := range list {
+		if bv.ParentId == 0 {
+			RefreshEdbRelation(bv.FutureGoodEdbInfoId)
+		}
+	}
 	return err
 }

services/data_entry.go

@@ -12,7 +12,7 @@ import (
 
 //数据录入
 
-//日度消息推送
+// 日度消息推送
 func FrequencyByDay() (err error) {
 	defer func() {
 		if err != nil {
@@ -84,7 +84,7 @@ func FrequencyByDay() (err error) {
 				openIdList = append(openIdList, openIdItem)
 
 				first := "数据录入提醒"
-				keyword1 := v.SecName
+				keyword1 := v.SecName + "该更新了"
 				keyword2 := "每日 " + v.NoticeTime
 				remark := v.SecName + "该更新了"
 				err = SendWxMsgWithFrequency(first, keyword1, keyword2, remark, openIdList)
@@ -97,7 +97,7 @@ func FrequencyByDay() (err error) {
 	return
 }
 
-//周度消息推送
+// 周度消息推送
 func FrequencyByWeek() (err error) {
 	defer func() {
 		if err != nil {
@@ -211,7 +211,7 @@ func FrequencyByWeek() (err error) {
 				openIdList = append(openIdList, openIdItem)
 
 				first := "数据录入提醒"
-				keyword1 := v.SecName
+				keyword1 := v.SecName + "该更新了"
 				keyword2 := "每周 " + v.NoticeTime
 				remark := v.SecName + "该更新了"
 
@@ -238,7 +238,7 @@ func FrequencyByWeek() (err error) {
 	return
 }
 
-//周度消息推送
+// 周度消息推送
 func FrequencyByMonth() (err error) {
 	defer func() {
 		if err != nil {
@@ -339,7 +339,7 @@ func FrequencyByMonth() (err error) {
 				openIdList = append(openIdList, openIdItem)
 
 				first := "数据录入提醒"
-				keyword1 := v.SecName
+				keyword1 := v.SecName + "该更新了"
 				keyword2 := "每月 " + v.NoticeTime
 				remark := v.SecName + "该更新了"
 

services/task.go

@@ -306,11 +306,6 @@ func RefreshData(cont context.Context) (err error) {
 	time.Sleep(5 * time.Second)
 	data.RefreshNotice()
 
-	// 刷新商品期货数据
-	{
-		future_good.RefreshFutureGoodDataFromThs()
-	}
-
 	fmt.Println("Refresh End")
 	return
 }
@@ -745,7 +740,7 @@ func AddEdbTask(cont context.Context) (err error) {
 					openIdList = append(openIdList, openIdTemp)
 
 					first := "数据录入提醒"
-					keyword1 := tmpEdb.SecName
+					keyword1 := tmpEdb.SecName + "该更新了"
 					keyword2 := notifyFrequency + " " + tmpEdb.NoticeTime
 					remark := tmpEdb.SecName + "该更新了"
 

services/wx_template_msg.go

@@ -107,7 +107,7 @@ func SendTemplateMsg(sendUrl string, data []byte) (err error) {
 	return
 }
 
-//到期提醒模板消息
+// 到期提醒模板消息
 func SendWxMsgWithCompanyRemind(first, keyword1, keyword2, remark string, openIdList []*models.OpenIdList) (err error) {
 	var msg string
 	defer func() {
@@ -223,7 +223,7 @@ type SendWxTemplate struct {
 	OpenIdArr      []string `description:"消息接收者openid"`
 }
 
-//推送模板消息
+// 推送模板消息
 func SendTemplateMsgV2(sendInfo *SendWxTemplate) (err error) {
 	postData, err := json.Marshal(sendInfo)
 	if err != nil {
@@ -291,8 +291,10 @@ func SendYbVoiceBroadcastWxMsg(broadcastId int, sectionName, broadcastName strin
 	}
 
 	first := "您好，有新的语音播报待查看"
-	keyword1 := fmt.Sprint(sectionName, "：", broadcastName)
-	keyword2 := "待查看"
+	//keyword1 := fmt.Sprint(sectionName, "：", broadcastName)
+	//keyword2 := "待查看"
+	keyword1 := broadcastName
+	keyword2 := fmt.Sprintf("【%s】 待查看", sectionName)
 	remark := "请点击详情查看"
 	wxAppPath := fmt.Sprintf("pages-voice/voiceDetail?voiceId=%d", broadcastId)
 	sendInfo := new(SendWxTemplate)