Merge branch 'yb/8.0' into debug

models/data_manage/user_record.go

@@ -6,14 +6,14 @@ import (
 
 func GetUnSubUserOpenid(openIdstr string) (items []string, err error){
 	sql := `SELECT open_id FROM user_record 
-          WHERE open_id IS NOT NULL AND subscribe=0 `
+          WHERE open_id IS NOT NULL AND subscribe=0 AND create_platform=1 `
 	sql += ` AND open_id in (` + openIdstr + `) `
 	_, err = orm.NewOrm().Raw(sql).QueryRows(&items)
 	return
 }
 
 func UpdateSubStatus(unSubIds string) (err error){
-	sql := "UPDATE user_record SET subscribe=1 WHERE 1=1 "
+	sql := "UPDATE user_record SET subscribe=1,subscribe_time=NOW() WHERE create_platform=1 "
 	sql += ` AND open_id in (` + unSubIds + `) `
 	_, err = orm.NewOrm().Raw(sql).Exec()
 	return

services/report_push.go

@@ -508,7 +508,7 @@ func SendYbPriceDrivenToThs(priceDrivenId int) (err error) {
 		permissionName = "宏观"
 	}
 	title := fmt.Sprintf("%s价格驱动", permissionName)
-	jumpUrl := fmt.Sprintf("pages/pricedriven/pricedriven?default_classify_first=%d&default_classify_sub=%d", firstClassify.Id, chartPermissionId)
+	jumpUrl := fmt.Sprintf(`%s/pages/pricedriven/pricedriven?default_classify_first=%d&default_classify_sub=%d`, utils.WxYbAppId, firstClassify.Id, chartPermissionId)
 	logoUrl := `https://hongze.oss-cn-shanghai.aliyuncs.com/hzyj.png`
 	// 推送至同花顺
 	dataType := "2"
@@ -528,15 +528,8 @@ func SendYbCommunityVideoToThs(videoId int) (err error) {
 		err = errors.New("获取视频信息失败, Err:" + e.Error())
 		return
 	}
-	permissionName := video.ChartPermissionName
+	permissionName := "宏观"	// 所有客群都推
 	title := video.Title
-	if permissionName == "" {
-		err = errors.New("客群标签为空, 不可推送")
-		return
-	}
-	if permissionName == "宏观经济" {
-		permissionName = "宏观"
-	}
 	jumpUrl := fmt.Sprint(utils.WxYbAppId + `/pages/video/videoList?videoId=`, videoId)
 	logoUrl := `https://hongze.oss-cn-shanghai.aliyuncs.com/hzyj.png`
 	// 推送至同花顺

services/save_log.go

@@ -3,16 +3,26 @@ package services
 import (
 	"context"
 	"hongze/hongze_task/models/data_manage"
+	"hongze/hongze_task/services/alarm_msg"
 	"hongze/hongze_task/utils"
 	"time"
 )
 
 func DeleteLog(cont context.Context) (err error) {
 	date := time.Now().AddDate(0,-1,0).Format(utils.FormatDateTime)
-	err = data_manage.DeletePPTLogByDate(date)
-	if err != nil {
-		return
-	}
-	err = data_manage.DeleteReportLogByDate(date)
+	go func() {
+		err = data_manage.DeletePPTLogByDate(date)
+		if err != nil {
+			alarm_msg.SendAlarmMsg("DeletePPTLogByDate ErrMsg:"+err.Error(), 3)
+		}
+	}()
+
+	go func() {
+		err = data_manage.DeleteReportLogByDate(date)
+		if err != nil {
+			alarm_msg.SendAlarmMsg("DeleteReportLogByDate ErrMsg:"+err.Error(), 3)
+		}
+	}()
+
 	return
 }