From e45d85e9993b53f039320e87ed7a20844bc4f00b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 26 Mar 2021 16:29:27 +0800
Subject: [PATCH] aa

---
 business/jxutils/weixinmsg/weixinmsg.go | 3 ++-
 business/model/message.go               | 1 +
 controllers/cms_msg.go                  | 6 ++++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/business/jxutils/weixinmsg/weixinmsg.go b/business/jxutils/weixinmsg/weixinmsg.go
index 7c08a6c0b..74d3ef93f 100644
--- a/business/jxutils/weixinmsg/weixinmsg.go
+++ b/business/jxutils/weixinmsg/weixinmsg.go
@@ -795,7 +795,7 @@ func NotifyStoreAlertMessage(storeID int, storeName, title, content string) (err
 	return err
 }
 
-func SendStoreMessage(ctx *jxcontext.Context, title, content string, storeIDs []int, actInfo string, messageType int, isAsync, isContinueWhenError bool) (hint string, err error) {
+func SendStoreMessage(ctx *jxcontext.Context, title, content string, storeIDs []int, imgs []string, actInfo string, messageType int, isAsync, isContinueWhenError bool) (hint string, err error) {
 	db := dao.GetDB()
 	//权限
 	if permission.IsRoled(ctx) {
@@ -831,6 +831,7 @@ func SendStoreMessage(ctx *jxcontext.Context, title, content string, storeIDs []
 		Content: content,
 		Type:    int8(messageType),
 		ActInfo: actInfo,
+		Imgs:    strings.Join(imgs, ","),
 	}
 	dao.WrapAddIDCULDEntity(msg, ctx.GetUserName())
 	if err = dao.CreateEntity(db, msg); err != nil {
diff --git a/business/model/message.go b/business/model/message.go
index ef8475cb4..92b7ad2cd 100644
--- a/business/model/message.go
+++ b/business/model/message.go
@@ -28,6 +28,7 @@ type Message struct {
 	Title   string `json:"title"`
 	Content string `orm:"type(text)" json:"content"`
 	ActInfo string `json:"actInfo"` //活动信息，时间平台等
+	Imgs    string `json:"imgs"`    //图片集合
 }
 
 func (*Message) TableIndex() [][]string {
diff --git a/controllers/cms_msg.go b/controllers/cms_msg.go
index e073856ee..82e5b6b01 100644
--- a/controllers/cms_msg.go
+++ b/controllers/cms_msg.go
@@ -23,6 +23,7 @@ type MsgController struct {
 // @Param	content			formData	string	true	"消息内容"
 // @Param	messageType		formData	int		true	"消息类型，1为普通给商家发的消息，3为活动内容通知"
 // @Param	actInfo			formData	string	false	"如果是活动内容通知需传"
+// @Param	imgs			formData	string	false	"图片s"
 // @Param	isAsync			formData	bool	false	"是否异步操作，缺省否"
 // @Param	isContinueWhenError	formData	bool	false	"单个失败是否继续，缺省false"
 // @Success 200 {object} controllers.CallResult
@@ -31,10 +32,11 @@ type MsgController struct {
 func (c *MsgController) SendStoreMessage() {
 	c.callSendStoreMessage(func(params *tMsgSendStoreMessageParams) (retVal interface{}, errCode string, err error) {
 		var storeIDs []int
-		if err = jxutils.Strings2Objs(params.StoreIDs, &storeIDs); err != nil {
+		var imgs []string
+		if err = jxutils.Strings2Objs(params.StoreIDs, &storeIDs, params.Imgs, &imgs); err != nil {
 			return retVal, "", err
 		}
-		retVal, err = weixinmsg.SendStoreMessage(params.Ctx, params.Title, params.Content, storeIDs, params.ActInfo, params.MessageType, params.IsAsync, params.IsContinueWhenError)
+		retVal, err = weixinmsg.SendStoreMessage(params.Ctx, params.Title, params.Content, storeIDs, imgs, params.ActInfo, params.MessageType, params.IsAsync, params.IsContinueWhenError)
 		return retVal, "", err
 	})
 }