fix:模板推送

controllers/wechat.go

@@ -1,9 +1,7 @@
 package controllers
 
 import (
-	"encoding/json"
 	"eta/eta_mini_bridge/models"
-	"eta/eta_mini_bridge/models/request"
 	"eta/eta_mini_bridge/services"
 	"eta/eta_mini_bridge/utils"
 	"fmt"
@@ -17,22 +15,22 @@ type WeChatController struct {
 
 // @Title 发送微信模板接口
 // @Description 发送微信模板接口
-// @Param	request	body request.SendWxTemplateReq true "type json string"
+// @Param	ReportId query int true "报告id"
 // @Success 200 {object} models.WechatSign
-// @router /send_template_msg [post]
+// @router /send_template_msg [get]
 func (this *WeChatController) SendTemplateMsg() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
 		this.Data["json"] = br
 		this.ServeJSON()
 	}()
-	var req request.SendWxTemplateReq
-	if err := json.Unmarshal(this.Ctx.Input.RequestBody, &req); err != nil {
+	reportId, _ := this.GetInt("ReportId")
+	if reportId <= 0 {
 		br.Msg = "参数错误"
-		br.ErrMsg = "参数解析错误，Err:" + err.Error()
+		br.ErrMsg = "参数错误，报告id小于等于0"
 		return
 	}
-	report, err := models.GetReportById(req.ReportId)
+	report, err := models.GetReportById(reportId)
 	if err != nil {
 		br.Msg = "该报告已删除"
 		br.ErrMsg = "获取报告详情失败,Err:" + err.Error()

models/user.go

@@ -63,8 +63,8 @@ func ModifyUserRegisterStatus(userId int, status bool, registerTime, modifyTime
 
 func GetUserBySubscribe() (user []*User, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT user FROM user WHERE is_subscribed=1 AND is_registered=1 `
-	err = o.Raw(sql).QueryRow(&user)
+	sql := `SELECT * FROM user WHERE is_subscribed=1 AND is_registered=1 `
+	_, err = o.Raw(sql).QueryRows(&user)
 	return
 }
 
@@ -104,7 +104,7 @@ func GetUserItemByUserId(userId int) (item *UserItem, err error) {
 }
 
 func GetUserUnionIdListByIds(userIds []int) (items []string, err error) {
-	sql := `SELECT union_id FROM user WHERE user_id IN (%s) `
+	sql := `SELECT union_id FROM user WHERE user_id IN (%s) AND union_id IS NOT NULL`
 	var idsStr string
 	if len(userIds) > 0 {
 		var userIdsStr []string

models/user_record.go

@@ -1,7 +1,6 @@
 package models
 
 import (
-	"strings"
 	"time"
 
 	"github.com/beego/beego/v2/client/orm"
@@ -36,14 +35,18 @@ func GetUserRecordByUnionids(unionIds []string) (items []*UserRecord, err error)
 	if len(unionIds) == 0 {
 		return
 	}
-	sql := `SELECT * FROM user_record WHERE union_id in (`
-	var idsStr string
-	if len(unionIds) > 0 {
-		idsStr = strings.Join(unionIds, ",")
-		sql += idsStr
+	sql := `SELECT * FROM user_record WHERE union_id IN (`
+	// var idsStr string
+	for range unionIds {
+		sql += "?,"
 	}
+	// if len(unionIds) > 0 {
+	// 	idsStr = strings.Join(unionIds, ",")
+	// 	sql += idsStr
+	// }
+	sql = sql[:len(sql)-1]
 	sql += `) `
-	_, err = orm.NewOrm().Raw(sql).QueryRows(&items)
+	_, err = orm.NewOrm().Raw(sql, unionIds).QueryRows(&items)
 	return
 
 }

routers/commentsRouter.go

@@ -119,7 +119,7 @@ func init() {
         beego.ControllerComments{
             Method: "SendTemplateMsg",
             Router: `/send_template_msg`,
-            AllowHTTPMethods: []string{"post"},
+            AllowHTTPMethods: []string{"get"},
             MethodParams: param.Make(),
             Filters: nil,
             Params: nil})

routers/router.go

@@ -38,6 +38,11 @@ func init() {
 				&controllers.ChartController{},
 			),
 		),
+		web.NSNamespace("/wechat",
+			web.NSInclude(
+				&controllers.WeChatController{},
+			),
+		),
 	)
 	web.AddNamespace(ns)
 }