Merge branch 'yx_1.1' into debug

models/activity.go

@@ -733,7 +733,7 @@ WHERE
 	AND a.chart_permission_id = 31
 	AND a.activity_time <= ? AND a.activity_time >= NOW() 
 	AND s.is_cancel = 0
-	AND( a.activity_type_id IN (4,5,6) OR (a.activity_type_id = 3 AND a.is_limit_people = 1 )) 	GROUP BY s.id`
+	AND( a.activity_type_id IN (5,8)) 	GROUP BY s.id`
 	_, err = o.Raw(sql, endDate).QueryRows(&items)
 	return
 }

services/wx_category_template_msg.go

@@ -180,7 +180,7 @@ func SendNeiRongZuActivitieSignCategoryTemplateMsg(user *models.WxUserItem, acti
 		err = errors.New("GetConfigByCode, Err: " + e.Error() + configCode)
 		return
 	}
-	openIdList, e := models.GetUserRecordListByMobile(4, cnf.ConfigValue+","+sellerItemQy.Mobile+utils.MobileShenTao)
+	openIdList, e := models.GetUserRecordListByMobile(4, cnf.ConfigValue+","+sellerItemQy.Mobile+","+utils.MobileShenTao)
 	if e != nil && e.Error() != utils.ErrNoRow() {
 		err = errors.New("GetUserRecordListByMobile, Err: " + e.Error() + cnf.ConfigValue)
 		return
@@ -234,7 +234,7 @@ func SendActivitieCancelSignCategoryTemplateMsg(user *models.WxUserItem, activit
 		err = errors.New("GetConfigByCode, Err: " + e.Error() + configCode)
 		return
 	}
-	openIdList, e := models.GetUserRecordListByMobile(4, cnf.ConfigValue+","+sellerItemQy.Mobile+utils.MobileShenTao)
+	openIdList, e := models.GetUserRecordListByMobile(4, cnf.ConfigValue+","+sellerItemQy.Mobile+","+utils.MobileShenTao)
 	if e != nil && e.Error() != utils.ErrNoRow() {
 		err = errors.New("GetUserRecordListByMobile, Err: " + e.Error() + cnf.ConfigValue)
 		return
@@ -819,7 +819,7 @@ func SendEmailFileForAskMsgResearch(cont context.Context) (err error) {
 			}
 
 			//给所属销售推送消息
-			if sellerItem != nil {
+			if sellerItem != nil && user != nil {
 				openIpItem, _ := models.GetUserRecordByMobile(4, sellerItem.Mobile)
 				openIdList := make([]*models.OpenIdList,0)
 				openIdList = append(openIdList, openIpItem)
@@ -914,7 +914,23 @@ func SendActivityBeginMsg(cont context.Context) (err error) {
 		openIdList := make([]*models.OpenIdList, 0)
 		openIdList = append(openIdList, openIdItem)
 
-		SendWxMsgWithFrequencyBycategory(v.ActivityName, v.ActivityTime, openIdList, v.ActivityId)
+		openIdArr := make([]string, 0)
+		for _, v := range openIdList {
+			openIdArr = append(openIdArr, v.OpenId)
+		}
+		keywords := []string{v.ActivityName, v.ActivityTime}
+
+		sendInfo := new(SendWxCategoryTemplate)
+		sendInfo.Keywords = keywords
+		sendInfo.TemplateId = utils.WxMsgCategoryTemplateIdActivityPublishApply
+		sendInfo.RedirectTarget = 4
+		sendInfo.SendType = utils.TEMPLATE_MSG_CYGX_ARTICLE_ADD
+		sendInfo.OpenIdArr = openIdArr
+		//sendInfo.RedirectUrl = redirectUrl
+		err = SendCategoryTemplateMsg(sendInfo)
+		if err != nil {
+			return
+		}
 	}
 	if len(signupIds) == 0 {
 		return
@@ -998,52 +1014,26 @@ func SendActivityBeginMsgMeeting(cont context.Context) (err error) {
 			openIdItem.UserId = vOpenid.UserId
 			openIdList = append(openIdList, openIdItem)
 		}
-		//var reserveResults string
-		//var keyword2 string
-		//reserveResults = "--"
-		//keyword2 = "将在15分钟后开始"
-		//SendWxMsgWithFrequency(keyword2, v.ActivityName, reserveResults, v.ActivityTimeText, "--", remark, openIdList, v.ActivityId)
-		SendWxMsgWithFrequencyBycategory(v.ActivityName, v.ActivityTime, openIdList, v.ActivityId)
+		openIdArr := make([]string, 0)
+		for _, v := range openIdList {
+			openIdArr = append(openIdArr, v.OpenId)
+		}
+		keywords := []string{v.ActivityName, v.ActivityTime}
+
+		sendInfo := new(SendWxCategoryTemplate)
+		sendInfo.Keywords = keywords
+		sendInfo.TemplateId = utils.WxMsgCategoryTemplateIdActivityPublishApply
+		sendInfo.RedirectTarget = 4
+		sendInfo.SendType = utils.TEMPLATE_MSG_CYGX_ARTICLE_ADD
+		sendInfo.OpenIdArr = openIdArr
+		//sendInfo.RedirectUrl = redirectUrl
+		err = SendCategoryTemplateMsg(sendInfo)
+		if err != nil {
+			return
+		}
 	}
 	err = models.UpdateSendedMsgMeetingSendWxMsg(activityIds)
 	return
 }
 
 
-// 活动预开始模版消息通知(类目模版消息，暂时单独推送)
-func SendWxMsgWithFrequencyBycategory(keyWord1, keyWord2 string, openIdList []*models.OpenIdList, activityId int) (err error) {
-	if len(openIdList) == 0 {
-		return
-	}
-	var msg string
-	defer func() {
-		if err != nil {
-			go utils.SendAlarmMsg(fmt.Sprint("活动预开始模版消息通知消息失败SendWxMsgWithFrequencyBycategory ,activityId：", activityId, msg+";Err:"+err.Error()), 2)
-			utils.FileLog.Info("发送模版消息失败,Err:%s", err.Error())
-		}
-	}()
-	accessToken, err := models.GetWxAccessTokenByXzs()
-	if err != nil {
-		msg = "GetWxAccessToken Err:" + err.Error()
-		return
-	}
-	if accessToken == "" {
-		msg = "accessToken is empty"
-		return
-	}
-	keyWord1 = utils.TruncateActivityNameString(keyWord1)
-	//keyword1 := keyWord2
-	//keyword1 := keyWord2
-	sendUrl := "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=" + accessToken
-	templateId := utils.WxMsgTemplateIdActivityChangeApplyXzs
-	redirectUrl := utils.WX_MSG_PATH_ACTIVITY_DETAIL + strconv.Itoa(activityId)
-	sendMap := make(map[string]interface{})
-	sendData := make(map[string]interface{})
-	sendMap["template_id"] = templateId
-	sendMap["miniprogram"] = map[string]interface{}{"appid": utils.WxAppId, "pagepath": redirectUrl}
-	sendData["thing18"] = map[string]interface{}{"value": keyWord1, "color": "#173177"}
-	sendData["time23"] = map[string]interface{}{"value": keyWord2, "color": "#173177"}
-	sendMap["data"] = sendData
-	WxSendTemplateMsg(sendUrl, sendMap, openIdList, strconv.Itoa(activityId), utils.TEMPLATE_MSG_CYGX_ACTIVITY_ADD)
-	return
-}