Merge branch 'master' of http://git.shengws.com/zhangbj/scrm-go

controllers/global/open_wechat_controller.go

@@ -37,7 +37,7 @@ func (c *OpenWechatAPIController) Prepare() {
 //OpenWechatCtlRegistRouters 微信开放平台注册路由
 func OpenWechatCtlRegistRouters() {
 	beego.Router("/openwechat/authorizationevents", &OpenWechatAPIController{}, "*:AuthorizationEvents")
-	beego.Router("/openwechat/mp/notice", &OpenWechatAPIController{}, "Post:MpWechatNotice")
+	beego.Router("/openwechat/mp/notice/:appid", &OpenWechatAPIController{}, "Post:MpWechatNotice")
 	beego.Router("/openwechat/mp/authorization", &OpenWechatAPIController{}, "Get:Authorization")
 	beego.Router("/openwechat/mp/authorizerinfo/:id/:vtime/:vcode", &OpenWechatAPIController{}, "*:AuthorizerInfo")
 }
@@ -132,7 +132,7 @@ func (c *OpenWechatAPIController) AuthorizationEvents() {
 
 //MpWechatNotice 授权后公众号消息与事件接收URL
 func (c *OpenWechatAPIController) MpWechatNotice() {
-	appid := c.GetString("appid")
+	appid := c.Ctx.Input.Param(":appid")
 	if len(appid) == 0 {
 		utils.ErrorLog("appid not found")
 		c.Ctx.WriteString("success")

controllers/mpwechat/material_controller.go

@@ -0,0 +1,116 @@
+package mpwechat
+
+import (
+	base_ctl "SCRM/controllers"
+	"SCRM/enums"
+	"SCRM/service/wechat_service"
+	"SCRM/utils"
+	"bytes"
+	"mime/multipart"
+	"sync"
+
+	"io"
+
+	"github.com/astaxie/beego"
+	"github.com/astaxie/beego/httplib"
+)
+
+func MpMaterialCtlRegistRouters() {
+	beego.Router("/api/mpwechat/media/add_material", &MpMaterialAPIController{}, "Post:AddMaterial")
+}
+
+type MpMaterialAPIController struct {
+	base_ctl.BaseAuthAPIController
+}
+
+type MultipartFormField struct {
+	IsFile   bool
+	Name     string
+	FileName string
+	Value    io.Reader
+}
+
+var mediaBufferPool = sync.Pool{
+	New: func() interface{} {
+		return bytes.NewBuffer(make([]byte, 0, 10<<20)) // 10MB
+	},
+}
+
+func (c MpMaterialAPIController) AddMaterial() {
+
+	adminUserInfo := c.GetAdminUserInfo()
+
+	authorization, err := wechat_service.GetAuthorizationByOrgID(adminUserInfo.CurrentOrgId)
+	if err != nil {
+		c.ServeFailJsonSend(enums.ErrorCodeDataException, "上传失败:（"+err.Error()+"）")
+		return
+	}
+	if authorization == nil || authorization.AuthorizerStatus != 1 {
+		c.ServeFailJsonSend(enums.ErrorCodeDBUpdate, "上传失败:（公众号未授权）")
+		return
+	}
+
+	file, head, err := c.GetFile("file")
+	if err != nil {
+		c.ServeFailJsonSend(enums.ErrorCodeDBUpdate, "上传失败:（"+err.Error()+"）")
+		return
+	}
+	defer file.Close()
+
+	var fields = []MultipartFormField{
+		{
+			IsFile:   true,
+			Name:     "media",
+			FileName: head.Filename,
+			Value:    file,
+		},
+	}
+
+	buffer := mediaBufferPool.Get().(*bytes.Buffer)
+	buffer.Reset()
+	defer mediaBufferPool.Put(buffer)
+
+	multipartWriter := multipart.NewWriter(buffer)
+	for i := 0; i < len(fields); i++ {
+		if field := &fields[i]; field.IsFile {
+			partWriter, err3 := multipartWriter.CreateFormFile(field.Name, field.FileName)
+			if err3 != nil {
+				c.ServeFailJsonSend(enums.ErrorCodeDBUpdate, "上传失败:（"+err3.Error()+"）")
+				return
+			}
+			if _, err3 = io.Copy(partWriter, field.Value); err3 != nil {
+				c.ServeFailJsonSend(enums.ErrorCodeDBUpdate, "上传失败:（"+err3.Error()+"）")
+				return
+			}
+		} else {
+			partWriter, err3 := multipartWriter.CreateFormField(field.Name)
+			if err3 != nil {
+				c.ServeFailJsonSend(enums.ErrorCodeDBUpdate, "上传失败:（"+err3.Error()+"）")
+				return
+			}
+			if _, err3 = io.Copy(partWriter, field.Value); err3 != nil {
+				c.ServeFailJsonSend(enums.ErrorCodeDBUpdate, "上传失败:（"+err3.Error()+"）")
+				return
+			}
+		}
+	}
+
+	if err = multipartWriter.Close(); err != nil {
+		c.ServeFailJsonSend(enums.ErrorCodeDBUpdate, "上传失败:（"+err.Error()+"）")
+		return
+	}
+	requestBodyBytes := buffer.Bytes()
+	requestBodyType := multipartWriter.FormDataContentType()
+	url := "https://api.weixin.qq.com/cgi-bin/material/add_material?type=image&access_token=" + authorization.AuthorizerAccessToken
+	res := httplib.Post(url)
+	res.Header("Content-Type", requestBodyType)
+	res.Body(requestBodyBytes)
+	response := make(map[string]interface{}, 0)
+	res.ToJSON(&response)
+	utils.InfoLog("%v", response)
+
+	returnData := make(map[string]interface{}, 0)
+	returnData["ok"] = "msg"
+	c.ServeSuccessJSON(returnData)
+	return
+}

controllers/mpwechat/menu_controller.go

@@ -15,6 +15,7 @@ import (
 func MpMenusCtlRegistRouters() {
 	beego.Router("/api/mpwechat/menus", &MpMenusAPIController{}, "Get:GetMenus")
 	beego.Router("/api/mpwechat/savemenus", &MpMenusAPIController{}, "Put:SaveMenus")
+	beego.Router("/api/mpwechat/deletemenus", &MpMenusAPIController{}, "Post:DeleteMenu")
 }
 
 type MpMenusAPIController struct {
@@ -188,3 +189,52 @@ func (c *MpMenusAPIController) SaveMenus() {
 	c.ServeSuccessJSON(returnData)
 	return
 }
+
+func (c *MpMenusAPIController) DeleteMenu() {
+
+	adminUserInfo := c.GetAdminUserInfo()
+	authorization, err := wechat_service.GetAuthorizationByOrgID(adminUserInfo.CurrentOrgId)
+	if err != nil {
+		c.ServeFailJsonSend(enums.ErrorCodeDataException, "删除菜单失败:（"+err.Error()+"）")
+		return
+	}
+	if authorization == nil || authorization.AuthorizerStatus != 1 {
+		c.ServeFailJsonSend(enums.ErrorCodeDBUpdate, "删除菜单失败:（未授权）")
+		return
+	}
+
+	// 授权方公众号类型，0代表订阅号，1代表由历史老帐号升级后的订阅号，2代表服务号
+	// 授权方认证类型，-1代表未认证，0代表微信认证，1代表新浪微博认证，2代表腾讯微博认证，3代表已资质认证通过但还未通过名称认证，4代表已资质认证通过、还未通过名称认证，但通过了新浪微博认证，5代表已资质认证通过、还未通过名称认证，但通过了腾讯微博认证
+	if (authorization.AuthorizerServiceTypeInfo == 0 || authorization.AuthorizerServiceTypeInfo == 1) && authorization.AuthorizerVerifyTypeInfo == -1 {
+		c.ServeFailJsonSend(enums.ErrorCodeDBUpdate, "删除菜单失败:（未认证的订阅号没有自定义菜单相关接口的权限）")
+		return
+	}
+
+	button, err := wechat_service.GetMenusByOrgID(adminUserInfo.CurrentOrgId)
+	if err != nil {
+		c.ServeFailJsonSend(enums.ErrorCodeDataException, "删除菜单失败:（"+err.Error()+"）")
+		return
+	}
+	if button == nil || button.ButtonStatus != 1 {
+		c.ServeFailJsonSend(enums.ErrorCodeDataException, "删除菜单失败:（未设置菜单）")
+		return
+	}
+
+	err = wechat_service.DeleteMpWechatMenus(authorization.AuthorizerAccessToken)
+	if err != nil {
+		c.ServeFailJsonSend(enums.ErrorCodeDataException, "删除菜单失败:（"+err.Error()+"）")
+		return
+	}
+
+	err = wechat_service.DeleteButton(adminUserInfo.CurrentOrgId, button.ID)
+	if err != nil {
+		c.ServeFailJsonSend(enums.ErrorCodeDataException, "删除菜单失败:（"+err.Error()+"）")
+		return
+	}
+
+	returnData := make(map[string]interface{}, 0)
+	returnData["msg"] = "ok"
+	c.ServeSuccessJSON(returnData)
+	return
+
+}

controllers/mpwechat/reply_controller.go

@@ -0,0 +1,318 @@
+package mpwechat
+
+import (
+	base_ctl "SCRM/controllers"
+	"SCRM/enums"
+	"SCRM/models"
+	"SCRM/service/wechat_service"
+	"encoding/json"
+	"reflect"
+
+	"SCRM/utils"
+	"time"
+
+	"github.com/astaxie/beego"
+)
+
+func MpReplyCtlRegistRouters() {
+	beego.Router("/api/mpwechat/reply/subscribe", &MpReplyAPIController{}, "Get:GetSubscribe")
+	beego.Router("/api/mpwechat/reply/subscribe", &MpReplyAPIController{}, "Put:SaveSubscribe")
+	beego.Router("/api/mpwechat/reply/kewords", &MpReplyAPIController{}, "Get:GetKeyWordReplys")
+	beego.Router("/api/mpwechat/reply/keword", &MpReplyAPIController{}, "Post:CreateKeyWordReply")
+	beego.Router("/api/mpwechat/reply/keword", &MpReplyAPIController{}, "Put:EditKeyWordReply")
+	beego.Router("/api/mpwechat/replys", &MpReplyAPIController{}, "Delete:DeleteReplys")
+}
+
+type MpReplyAPIController struct {
+	base_ctl.BaseAuthAPIController
+}
+
+func (c *MpReplyAPIController) GetSubscribe() {
+
+	adminUserInfo := c.GetAdminUserInfo()
+
+	message, err := wechat_service.GetOrgSubscribeReplyMessages(adminUserInfo.CurrentOrgId)
+	if err != nil {
+		c.ServeFailJsonSend(enums.ErrorCodeDataException, "读取关注回复数据失败:（"+err.Error()+"）")
+		return
+	}
+
+	returnData := make(map[string]interface{}, 0)
+	returnData["message"] = message
+	c.ServeSuccessJSON(returnData)
+	return
+}
+
+func (c *MpReplyAPIController) SaveSubscribe() {
+	adminUserInfo := c.GetAdminUserInfo()
+	timeNow := time.Now().Unix()
+
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		c.ServeFailJsonSend(enums.ErrorCodeParamWrong, "参数错误")
+		return
+	}
+
+	var saveMessage models.AuthorizationMessageManagements
+	message, err := wechat_service.GetOrgSubscribeReplyMessages(adminUserInfo.CurrentOrgId)
+	if err != nil {
+		c.ServeFailJsonSend(enums.ErrorCodeDataException, "保存失败:（"+err.Error()+"）")
+		return
+	}
+	if message != nil {
+		saveMessage = *message
+	} else {
+		saveMessage.CreatedTime = timeNow
+		saveMessage.MessageMsgType = "event"
+		saveMessage.MessageMsgEvent = "subscribe"
+		saveMessage.MessageStatus = 1
+		saveMessage.UserOrgId = adminUserInfo.CurrentOrgId
+	}
+
+	if dataBody["message_content"] == nil || reflect.TypeOf(dataBody["message_content"]).String() != "string" {
+		c.ServeFailJsonSend(enums.ErrorCodeParamWrong, "缺少参数:message_content")
+		return
+	}
+	messageContent, _ := dataBody["message_content"].(string)
+	saveMessage.MessageContent = messageContent
+	saveMessage.UpdatedTime = timeNow
+
+	err = wechat_service.SaveMessage(&saveMessage)
+	if err != nil {
+		c.ServeFailJsonSend(enums.ErrorCodeDBUpdate, "保存失败:（"+err.Error()+"）")
+		return
+	}
+
+	returnData := make(map[string]interface{}, 0)
+	returnData["message"] = saveMessage
+	c.ServeSuccessJSON(returnData)
+	return
+
+}
+
+func (c *MpReplyAPIController) GetKeyWordReplys() {
+	page, _ := c.GetInt64("page", 1)
+	limit, _ := c.GetInt64("limit", 10)
+	searchKey := c.GetString("search", "")
+	if page <= 0 {
+		page = 1
+	}
+	if limit <= 0 {
+		limit = 10
+	}
+
+	adminUserInfo := c.GetAdminUserInfo()
+	messages, total, err := wechat_service.GetPageKeyWordMessages(adminUserInfo.CurrentOrgId, page, limit, searchKey)
+	if err != nil {
+		c.ServeFailJsonSend(enums.ErrorCodeDBUpdate, "拉取失败:（"+err.Error()+"）")
+		return
+	}
+
+	returnData := make(map[string]interface{}, 0)
+	returnData["messages"] = messages
+	returnData["total"] = total
+	c.ServeSuccessJSON(returnData)
+	return
+}
+
+func (c *MpReplyAPIController) CreateKeyWordReply() {
+	adminUserInfo := c.GetAdminUserInfo()
+	timeNow := time.Now().Unix()
+
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		c.ServeFailJsonSend(enums.ErrorCodeParamWrong, "参数错误")
+		return
+	}
+
+	var message models.AuthorizationMessageManagements
+
+	if dataBody["message_regular_name"] == nil || reflect.TypeOf(dataBody["message_regular_name"]).String() != "string" {
+		c.ServeFailJsonSend(enums.ErrorCodeParamWrong, "缺少参数:message_regular_name")
+		return
+	}
+	messageRegularName, _ := dataBody["message_regular_name"].(string)
+	if len(messageRegularName) == 0 {
+		c.ServeFailJsonSend(enums.ErrorCodeParamWrong, "规则名称不能为空")
+		return
+	}
+	message.MessageRegularName = messageRegularName
+
+	if dataBody["message_key_type"] == nil || reflect.TypeOf(dataBody["message_key_type"]).String() != "float64" {
+		c.ServeFailJsonSend(enums.ErrorCodeParamWrong, "缺少参数:message_key_type")
+		return
+	}
+	messageKeyType := int64(dataBody["message_key_type"].(float64))
+	if messageKeyType != 1 && messageKeyType != 2 {
+		c.ServeFailJsonSend(enums.ErrorCodeParamWrong, "模式选择不正确")
+		return
+	}
+	message.MessageKeyType = messageKeyType
+
+	if dataBody["message_key_name"] == nil || reflect.TypeOf(dataBody["message_key_name"]).String() != "string" {
+		c.ServeFailJsonSend(enums.ErrorCodeParamWrong, "缺少参数:message_key_name")
+		return
+	}
+	messageKeyName, _ := dataBody["message_key_name"].(string)
+	if len(messageKeyName) == 0 {
+		c.ServeFailJsonSend(enums.ErrorCodeParamWrong, "关键字不能为空")
+		return
+	}
+	message.MessageKeyName = messageKeyName
+
+	if dataBody["message_content"] == nil || reflect.TypeOf(dataBody["message_content"]).String() != "string" {
+		c.ServeFailJsonSend(enums.ErrorCodeParamWrong, "缺少参数:message_content")
+		return
+	}
+	messageContent, _ := dataBody["message_content"].(string)
+	if len(messageKeyName) == 0 {
+		c.ServeFailJsonSend(enums.ErrorCodeParamWrong, "回复内容不能为空")
+		return
+	}
+	message.MessageContent = messageContent
+
+	message.MessageMsgType = "text"
+	message.UpdatedTime = timeNow
+	message.CreatedTime = timeNow
+	message.MessageStatus = 1
+	message.UserOrgId = adminUserInfo.CurrentOrgId
+
+	err = wechat_service.SaveMessage(&message)
+	if err != nil {
+		c.ServeFailJsonSend(enums.ErrorCodeDBCreate, "添加回复失败：（"+err.Error()+"）")
+		return
+	}
+
+	returnData := make(map[string]interface{}, 0)
+	returnData["message"] = message
+	c.ServeSuccessJSON(returnData)
+	return
+}
+
+func (c *MpReplyAPIController) EditKeyWordReply() {
+	id, _ := c.GetInt64("id", 0)
+	if id <= 0 {
+		c.ServeFailJsonSend(enums.ErrorCodeParamWrong, "参数错误:id")
+		return
+	}
+
+	adminUserInfo := c.GetAdminUserInfo()
+	timeNow := time.Now().Unix()
+
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		c.ServeFailJsonSend(enums.ErrorCodeParamWrong, "参数错误")
+		return
+	}
+
+	message, err := wechat_service.GetMessageByID(adminUserInfo.CurrentOrgId, id)
+	if err != nil {
+		c.ServeFailJsonSend(enums.ErrorCodeDataException, "保存失败:（"+err.Error()+"）")
+		return
+	}
+	if message == nil {
+		c.ServeFailJsonSend(enums.ErrorCodeDBUpdate, "保存失败:（回复不存在）")
+		return
+	}
+
+	if dataBody["message_regular_name"] == nil || reflect.TypeOf(dataBody["message_regular_name"]).String() != "string" {
+		c.ServeFailJsonSend(enums.ErrorCodeParamWrong, "缺少参数:message_regular_name")
+		return
+	}
+	messageRegularName, _ := dataBody["message_regular_name"].(string)
+	if len(messageRegularName) == 0 {
+		c.ServeFailJsonSend(enums.ErrorCodeParamWrong, "规则名称不能为空")
+		return
+	}
+	message.MessageRegularName = messageRegularName
+
+	if dataBody["message_key_type"] == nil || reflect.TypeOf(dataBody["message_key_type"]).String() != "float64" {
+		c.ServeFailJsonSend(enums.ErrorCodeParamWrong, "缺少参数:message_key_type")
+		return
+	}
+	messageKeyType := int64(dataBody["message_key_type"].(float64))
+	if messageKeyType != 1 && messageKeyType != 2 {
+		c.ServeFailJsonSend(enums.ErrorCodeParamWrong, "模式选择不正确")
+		return
+	}
+	message.MessageKeyType = messageKeyType
+
+	if dataBody["message_key_name"] == nil || reflect.TypeOf(dataBody["message_key_name"]).String() != "string" {
+		c.ServeFailJsonSend(enums.ErrorCodeParamWrong, "缺少参数:message_key_name")
+		return
+	}
+	messageKeyName, _ := dataBody["message_key_name"].(string)
+	if len(messageKeyName) == 0 {
+		c.ServeFailJsonSend(enums.ErrorCodeParamWrong, "关键字不能为空")
+		return
+	}
+	message.MessageKeyName = messageKeyName
+
+	if dataBody["message_content"] == nil || reflect.TypeOf(dataBody["message_content"]).String() != "string" {
+		c.ServeFailJsonSend(enums.ErrorCodeParamWrong, "缺少参数:message_content")
+		return
+	}
+	messageContent, _ := dataBody["message_content"].(string)
+	if len(messageKeyName) == 0 {
+		c.ServeFailJsonSend(enums.ErrorCodeParamWrong, "回复内容不能为空")
+		return
+	}
+	message.MessageContent = messageContent
+
+	message.UpdatedTime = timeNow
+
+	err = wechat_service.SaveMessage(message)
+	if err != nil {
+		c.ServeFailJsonSend(enums.ErrorCodeDBCreate, "编辑回复失败：（"+err.Error()+"）")
+		return
+	}
+
+	returnData := make(map[string]interface{}, 0)
+	returnData["message"] = message
+	c.ServeSuccessJSON(returnData)
+	return
+}
+
+func (c *MpReplyAPIController) DeleteReplys() {
+	adminUserInfo := c.GetAdminUserInfo()
+
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		c.ServeFailJsonSend(enums.ErrorCodeParamWrong, "参数错误")
+		return
+	}
+
+	idsInters := dataBody["ids"].([]interface{})
+	if len(idsInters) == 0 {
+		if err != nil {
+			c.ServeFailJsonSend(enums.ErrorCodeDBDelete, "删除失败:（没有选择回复）")
+			return
+		}
+	}
+
+	ids := make([]int64, 0)
+	for _, idsInter := range idsInters {
+		id := int64(idsInter.(float64))
+		ids = append(ids, id)
+	}
+
+	err = wechat_service.DeleteMessages(adminUserInfo.CurrentOrgId, ids)
+	if err != nil {
+		c.ServeFailJsonSend(enums.ErrorCodeDBDelete, "删除失败:（"+err.Error()+"）")
+		return
+	}
+
+	returnData := make(map[string]interface{}, 0)
+	returnData["msg"] = "ok"
+
+	c.ServeSuccessJSON(returnData)
+	return
+}

controllers/mpwechat/router_controller.go

@@ -3,4 +3,6 @@ package mpwechat
 func RegisterRouters() {
 	MpWechatCtlRegistRouters()
 	MpMenusCtlRegistRouters()
+	MpReplyCtlRegistRouters()
+	MpMaterialCtlRegistRouters()
 }

jobcron/open_wechat_job.go

@@ -156,19 +156,19 @@ func RequestMpWechatAccessToken() {
 		responseBytes, err = util.PostJSON(uri, ReqRefreshToken)
 		if err != nil {
 			utils.ErrorLog(" error: %s", err)
-			return
+			continue
 		}
 
 		var res wechat_service.MPResult
 		err = json.Unmarshal(responseBytes, &res)
 		if err != nil {
 			utils.ErrorLog(" error: %s", err)
-			return
+			continue
 		}
 
 		if res.ErrCode > 0 {
 			utils.ErrorLog(" error: %s", res.ErrMsg)
-			return
+			continue
 		}
 
 		var accessToken wechat_service.RefreshToken

main.go

@@ -18,8 +18,8 @@ func main() {
 
 	//微信开放平台
 	go func() {
-		// jobcron.RequestComponentAccessToken()
-		// jobcron.RequestMpWechatAccessToken()
+		jobcron.RequestComponentAccessToken()
+		jobcron.RequestMpWechatAccessToken()
 		// jobcron.ReqJsapiTicket()
 	}()
 	jobcron.StartOpenWechatCron()

service/wechat_service/menu_service.go

@@ -61,3 +61,7 @@ func SaveButtons(menu *Buttons) (err error) {
 	tx.Commit()
 	return
 }
+func DeleteButton(orgID, id int64) (err error) {
+	err = service.PatientWriteDB().Model(&models.AuthorizationButtons{}).Where("id=? and user_org_id=?", id, orgID).Update(map[string]interface{}{"ButtonStatus": 2, "UpdatedTime": time.Now().Unix()}).Error
+	return
+}

service/wechat_service/messages_service.go

@@ -3,6 +3,7 @@ package wechat_service
 import (
 	"SCRM/models"
 	"SCRM/service"
+	"time"
 
 	"github.com/jinzhu/gorm"
 )
@@ -18,8 +19,8 @@ func GetTextReplyMessagesByKey(userOrgID int64, keywrods string) (messages []*mo
 	return
 }
 
-//GetSubscribeReplyMessagesByOrgID 通过user_org_id（机构ID）取信息
-func GetSubscribeReplyMessagesByOrgID(orgID int64) (*models.AuthorizationMessageManagements, error) {
+//GetOrgSubscribeReplyMessages 通过user_org_id（机构ID）取信息
+func GetOrgSubscribeReplyMessages(orgID int64) (*models.AuthorizationMessageManagements, error) {
 
 	var message models.AuthorizationMessageManagements
 
@@ -51,3 +52,44 @@ func GetOrgAllClickMessages(orgID int64) (messages []*models.AuthorizationMessag
 	err = service.PatientReadDB().Where("user_org_id=? AND message_msg_type='event' AND message_msg_event='click'", orgID).Find(&messages).Error
 	return
 }
+
+func SaveMessage(m *models.AuthorizationMessageManagements) (err error) {
+	err = service.PatientWriteDB().Save(m).Error
+	return
+}
+
+func GetPageKeyWordMessages(orgID, page, limit int64, search string) (messages []*models.AuthorizationMessageManagements, total int64, err error) {
+	db := service.PatientReadDB().Model(&models.AuthorizationMessageManagements{}).Where("user_org_id=? and message_msg_type='text' and message_status=1", orgID)
+
+	if len(search) > 0 {
+		searchKey := "%" + search + "%"
+		db = db.Where("message_key_name LIKE ?", searchKey)
+	}
+	offset := (page - 1) * limit
+
+	err = db.Count(&total).Order("id desc").Offset(offset).Limit(limit).Find(&messages).Error
+
+	return
+}
+
+//GetMessageByID 通过ID取信息
+func GetMessageByID(orgID, id int64) (*models.AuthorizationMessageManagements, error) {
+	var message models.AuthorizationMessageManagements
+	err := service.PatientReadDB().Where("id=? and user_org_id=? and message_status=1", id, orgID).First(&message).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, nil
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &message, nil
+}
+
+func DeleteMessages(orgID int64, ids []int64) (err error) {
+	if len(ids) == 1 {
+		err = service.PatientWriteDB().Model(&models.AuthorizationMessageManagements{}).Where("id =? and user_org_id =?", ids[0], orgID).Update(map[string]interface{}{"MessageStatus": 2, "UpdatedTime": time.Now().Unix()}).Error
+	} else {
+		err = service.PatientWriteDB().Model(&models.AuthorizationMessageManagements{}).Where("id IN (?) and user_org_id =?", ids, orgID).Update(map[string]interface{}{"MessageStatus": 2, "UpdatedTime": time.Now().Unix()}).Error
+	}
+	return
+}

service/wechat_service/open_wechat_service.go

@@ -260,7 +260,7 @@ func SendSubscribeTextMessage(appid string, ToUserName string, FromUserName stri
 		return
 	}
 
-	message, err := GetSubscribeReplyMessagesByOrgID(arthorizer.UserOrgId)
+	message, err := GetOrgSubscribeReplyMessages(arthorizer.UserOrgId)
 	if err != nil {
 		utils.ErrorLog("SendSubscribeTextMessage error:%s", err)
 		Ctx.WriteString("success")
@@ -479,17 +479,18 @@ func SendMpWechatMenus(AuthorizerAccessToken string, jsonData []byte) (err error
 
 }
 
-func DeleteMpWechatMenus(AuthorizerAccessToken string) (bool, error) {
+func DeleteMpWechatMenus(AuthorizerAccessToken string) (err error) {
 	uri := fmt.Sprintf("https://api.weixin.qq.com/cgi-bin/menu/delete?access_token=%s", AuthorizerAccessToken)
 
 	b := httplib.Get(uri)
 	var result MPResult
-	err := b.ToJSON(&result)
+	err = b.ToJSON(&result)
 	if err != nil {
-		return false, err
+		return
 	}
 	if result.ErrCode > 0 {
-		return false, errors.New(result.ErrMsg)
+		err = errors.New(result.ErrMsg)
+		return
 	}
-	return true, nil
+	return
 }