Browse Source

no message

xingzai 3 years ago
parent
commit
ae67d535ce
5 changed files with 29 additions and 35 deletions
  1. 2 1
      models/activity.go
  2. 8 19
      services/activity.go
  3. 3 2
      services/task.go
  4. 10 5
      services/wx_template_msg.go
  5. 6 8
      utils/config.go

+ 2 - 1
models/activity.go

@@ -271,7 +271,8 @@ WHERE
 	AND a.publish_status = 1 
 	AND a.publish_status = 1 
 	AND a.activity_time <= ? AND a.activity_time >= NOW() 
 	AND a.activity_time <= ? AND a.activity_time >= NOW() 
 	AND s.is_cancel = 0
 	AND s.is_cancel = 0
-	AND s.fail_type = 0`
+	AND s.fail_type = 0
+	GROUP BY s.activity_id`
 	_, err = o.Raw(sql, endDate).QueryRows(&items)
 	_, err = o.Raw(sql, endDate).QueryRows(&items)
 	return
 	return
 }
 }

+ 8 - 19
services/activity.go

@@ -27,16 +27,7 @@ func SendActivityBeginMsg() (err error) {
 			fmt.Println("发送失败,Err:", err.Error())
 			fmt.Println("发送失败,Err:", err.Error())
 		}
 		}
 	}()
 	}()
-	first := "感谢您对,诺亚活动的支持,您的预报名结果如下:"
-	//keyword1 := "关键词11111"
-	//keyword2 := "关键词22222"
-	//remark := "备注"
-	//fmt.Println("发送开始")
 	openIdList := make([]*models.OpenIdList, 0)
 	openIdList := make([]*models.OpenIdList, 0)
-	//openIdItem := new(models.OpenIdList)
-	//openIdItem.OpenId = "oN0jD1QwcA2uRD0BC4mH5zJMo0eg"
-	//openIdList = append(openIdList, openIdItem)
-	//SendWxMsgWithFrequency(first, keyword1, keyword2, remark, openIdList)
 	endDate := time.Now().Add(+time.Minute * 30).Format("2006-01-02 15:04:05")
 	endDate := time.Now().Add(+time.Minute * 30).Format("2006-01-02 15:04:05")
 	listActivity, err := models.GetActivitySendMsgListAll(endDate)
 	listActivity, err := models.GetActivitySendMsgListAll(endDate)
 	fmt.Println(len(listActivity))
 	fmt.Println(len(listActivity))
@@ -47,31 +38,29 @@ func SendActivityBeginMsg() (err error) {
 	if len(listActivity) == 0 {
 	if len(listActivity) == 0 {
 		return
 		return
 	}
 	}
-
 	var remark = "如报名成功,点击详情可获取专属参会二维码凭证,并在签到时出示。如有住宿,请携带您的有效身份证件。期待与您见面!"
 	var remark = "如报名成功,点击详情可获取专属参会二维码凭证,并在签到时出示。如有住宿,请携带您的有效身份证件。期待与您见面!"
 	for _, v := range listActivity {
 	for _, v := range listActivity {
 		fmt.Println(v.OpenId)
 		fmt.Println(v.OpenId)
-		var keyword2 string
+		var reserveResults string
+		var first string
 		openIdItem := new(models.OpenIdList)
 		openIdItem := new(models.OpenIdList)
 		openIdItem.OpenId = "oN0jD1QwcA2uRD0BC4mH5zJMo0eg"
 		openIdItem.OpenId = "oN0jD1QwcA2uRD0BC4mH5zJMo0eg"
 		openIdList := make([]*models.OpenIdList, 0)
 		openIdList := make([]*models.OpenIdList, 0)
 		openIdList = append(openIdList, openIdItem)
 		openIdList = append(openIdList, openIdItem)
 		if v.FailType == 0 {
 		if v.FailType == 0 {
-			keyword2 = "成功"
+			reserveResults = "成功"
 		} else if v.FailType == 1 {
 		} else if v.FailType == 1 {
-			keyword2 = "失败(总人数已满)"
+			reserveResults = "失败(总人数已满)"
 		} else if v.FailType == 2 {
 		} else if v.FailType == 2 {
-			keyword2 = "失败(单机构超限制)"
+			reserveResults = "失败(单机构超限制)"
 		} else if v.FailType == 3 {
 		} else if v.FailType == 3 {
-			keyword2 = "失败(爽约次数超限)"
+			reserveResults = "失败(爽约次数超限)"
 		}
 		}
-		SendWxMsgWithFrequency(first, v.ActivityName, keyword2, v.Address, remark, openIdList)
+		first = "您有一场【" + v.ActivityTypeName + "】将在30分钟后开始"
+		SendWxMsgWithFrequency(first, v.ActivityName, reserveResults, v.ActivityTime, v.Address, remark, openIdList)
 		//openIdItem.OpenId = v.OpenId
 		//openIdItem.OpenId = v.OpenId
-
 	}
 	}
-
 	fmt.Println(openIdList)
 	fmt.Println(openIdList)
 	fmt.Println(len(listActivity))
 	fmt.Println(len(listActivity))
-
 	return
 	return
 }
 }

+ 3 - 2
services/task.go

@@ -40,8 +40,9 @@ func Task() {
 
 
 	//UpdateIndustrialManagementSubjectNnames()
 	//UpdateIndustrialManagementSubjectNnames()
 
 
-	//SendActivityBeginMsg()
-	//toolbox.StartTask()
+	SendActivityBeginMsg()
+
+	toolbox.StartTask()
 
 
 	//if utils.RunMode == "debug" {
 	//if utils.RunMode == "debug" {
 	//	//syncTacticsList := toolbox.NewTask("syncTacticsList", "0 */5 * * * *", SyncTacticsList)
 	//	//syncTacticsList := toolbox.NewTask("syncTacticsList", "0 */5 * * * *", SyncTacticsList)

+ 10 - 5
services/wx_template_msg.go

@@ -11,7 +11,7 @@ import (
 	"time"
 	"time"
 )
 )
 
 
-func SendWxMsgWithFrequency(first, keyword1, keyword2, keyword3, remark string, openIdList []*models.OpenIdList) (err error) {
+func SendWxMsgWithFrequency(first, activityName, reserveResults, activityTime, activityAddress, remark string, openIdList []*models.OpenIdList) (err error) {
 	var msg string
 	var msg string
 	defer func() {
 	defer func() {
 		if err != nil {
 		if err != nil {
@@ -36,12 +36,17 @@ func SendWxMsgWithFrequency(first, keyword1, keyword2, keyword3, remark string,
 	sendMap := make(map[string]interface{})
 	sendMap := make(map[string]interface{})
 	sendData := make(map[string]interface{})
 	sendData := make(map[string]interface{})
 	sendMap["template_id"] = templateId
 	sendMap["template_id"] = templateId
+	sendMap["url"] = "https://details.hzinsights.com/raiReportDtl?id=672d30ab508237ac28b92c3472c56688&fromType=manage"
+	sendMap["miniprogram"] = map[string]interface{}{"appid": utils.WxPublicAppId, "path": "pages/index/index"}
+	//sendMap["miniprogram"] = map[string]interface{}{"appid": "wx4a844c734d8c8e56", "path": "pages/index/index"}
 	sendData["first"] = map[string]interface{}{"value": first, "color": "#173177"}
 	sendData["first"] = map[string]interface{}{"value": first, "color": "#173177"}
-	sendData["keyword1"] = map[string]interface{}{"value": keyword1, "color": "#173177"}
-	sendData["keyword2"] = map[string]interface{}{"value": keyword2, "color": "#173177"}
-	sendData["keyword3"] = map[string]interface{}{"value": keyword3, "color": "#173177"}
+	sendData["activity_name"] = map[string]interface{}{"value": activityName, "color": "#173177"}
+	sendData["reserve_results"] = map[string]interface{}{"value": reserveResults, "color": "#173177"}
+	sendData["activity_time"] = map[string]interface{}{"value": activityTime, "color": "#173177"}
+	sendData["activity_address"] = map[string]interface{}{"value": activityAddress, "color": "#173177"}
 	sendData["remark"] = map[string]interface{}{"value": remark, "color": "#173177"}
 	sendData["remark"] = map[string]interface{}{"value": remark, "color": "#173177"}
 	sendMap["data"] = sendData
 	sendMap["data"] = sendData
+
 	WxSendTemplateMsg(sendUrl, sendMap, openIdList)
 	WxSendTemplateMsg(sendUrl, sendMap, openIdList)
 	return
 	return
 }
 }
@@ -55,6 +60,7 @@ func WxSendTemplateMsg(sendUrl string, sendMap map[string]interface{}, items []*
 			return err
 			return err
 		}
 		}
 		utils.FileLog.Info("One SendData:%s", string(data))
 		utils.FileLog.Info("One SendData:%s", string(data))
+		fmt.Println(string(data))
 		err = SendTemplateMsg(sendUrl, data)
 		err = SendTemplateMsg(sendUrl, data)
 		if err != nil {
 		if err != nil {
 			fmt.Println("send err:", err.Error())
 			fmt.Println("send err:", err.Error())
@@ -76,7 +82,6 @@ func SendTemplateMsg(sendUrl string, data []byte) (err error) {
 	utils.FileLog.Info("SendResult:%s", string(body))
 	utils.FileLog.Info("SendResult:%s", string(body))
 	var templateResponse models.SendTemplateResponse
 	var templateResponse models.SendTemplateResponse
 	err = json.Unmarshal(body, &templateResponse)
 	err = json.Unmarshal(body, &templateResponse)
-	fmt.Println(body)
 	fmt.Println(templateResponse.Errcode)
 	fmt.Println(templateResponse.Errcode)
 	fmt.Println(templateResponse.Errmsg)
 	fmt.Println(templateResponse.Errmsg)
 	if err != nil {
 	if err != nil {

+ 6 - 8
utils/config.go

@@ -65,9 +65,9 @@ func init() {
 	}
 	}
 	OnlineTime = "2021-06-01 00:00:01" //上线时间
 	OnlineTime = "2021-06-01 00:00:01" //上线时间
 	if RunMode == "release" {
 	if RunMode == "release" {
-		WxAppId = "wxcc32b61f96720d2f"
-		WxAppSecret = "06894933fafb24dafead7eaae09c08e0"
-		WxId = "gh_a9d3744e1072"
+		//WxAppId = "wxcc32b61f96720d2f"
+		//WxAppSecret = "06894933fafb24dafead7eaae09c08e0"
+		//WxId = "gh_a9d3744e1072"
 		//模板消息ID
 		//模板消息ID
 		WxMsgTemplateIdApply = "PaoDanHGlt1kFw5q-4_ipJSwO3FyZpxSSNg4rwB7YCk"
 		WxMsgTemplateIdApply = "PaoDanHGlt1kFw5q-4_ipJSwO3FyZpxSSNg4rwB7YCk"
 		WxMsgTemplateIdApplyCancel = "iEi4YRHwcPbc2PSEF1pptc39H4NsAJPrUIPEk2ynwiA"
 		WxMsgTemplateIdApplyCancel = "iEi4YRHwcPbc2PSEF1pptc39H4NsAJPrUIPEk2ynwiA"
@@ -78,10 +78,6 @@ func init() {
 		WxPublicId = "gh_b67e0049fb8c"
 		WxPublicId = "gh_b67e0049fb8c"
 		IndexName = "cygx_article_v5"
 		IndexName = "cygx_article_v5"
 	} else {
 	} else {
-		WxAppId = "wxcc32b61f96720d2f"
-		WxAppSecret = "06894933fafb24dafead7eaae09c08e0"
-		WxId = "gh_a9d3744e1072"
-
 		//模板消息ID
 		//模板消息ID
 		WxMsgTemplateIdApply = "qfNuops-sKrfIkbA7U97A7gSrX03mUpoEpJksRUdloo"
 		WxMsgTemplateIdApply = "qfNuops-sKrfIkbA7U97A7gSrX03mUpoEpJksRUdloo"
 		WxMsgTemplateIdApplyCancel = "UU_d7ks0XZBnWg2xFzxL9Heilm4kisX39K7dr4SDdO8"
 		WxMsgTemplateIdApplyCancel = "UU_d7ks0XZBnWg2xFzxL9Heilm4kisX39K7dr4SDdO8"
@@ -90,7 +86,9 @@ func init() {
 		//WxMsgTemplateIdActivityApply = "MwZ5wxfd0O1Yt0Pkf6OkfWP4USQzZbiEo5SkZ26735s"
 		//WxMsgTemplateIdActivityApply = "MwZ5wxfd0O1Yt0Pkf6OkfWP4USQzZbiEo5SkZ26735s"
 		WxMsgTemplateIdActivityChange = "qfNuops-CB7bOl7f3viMG4s1uhRo7WM0Jbx3WvodKuIZ8A_z8fM"
 		WxMsgTemplateIdActivityChange = "qfNuops-CB7bOl7f3viMG4s1uhRo7WM0Jbx3WvodKuIZ8A_z8fM"
 
 
-		WxPublicAppId = "wx9b5d7291e581233a"
+		//WxPublicAppId = "wx9b5d7291e581233a"
+		WxPublicAppId = "wxcc32b61f96720d2f"
+
 		WxPublicAppSecret = "f4d52e34021eee262dce9682b31f8861"
 		WxPublicAppSecret = "f4d52e34021eee262dce9682b31f8861"
 		WxPublicId = "gh_5dc508325c6f"
 		WxPublicId = "gh_5dc508325c6f"
 		IndexName = "cygx_article_v4"
 		IndexName = "cygx_article_v4"