发送消息增加参数

src/customerService/customController.go

@@ -12,18 +12,20 @@ import (
 )
 
 type customMsg struct {
-	Id         int                      `form:"id"`         //消息id
-	MsgType    int                      `form:"msgType"`    //消息类型
-	Title      string                   `form:"title"`      //标题
-	Content    string                   `form:"content"`    //内容
-	Link       string                   `form:"link"`       //链接
-	SendMode   int                      `form:"sendMode"`   //发送时效 发送模式  1- 定时 2-实时
-	SendTime   string                   `form:"sendTime"`   // 发送时间
-	AndroidUrl string                   `form:"androidUrl"` //安卓连接
-	IosUrl     string                   `form:"iosUrl"`     //ios连接
-	WeChatUrl  string                   `form:"weChatUrl"`  //微信连接
-	UserIds    string                   `form:"userIds"`    //发送用户id
-	UserArr    []map[string]interface{} `form:"userArr"`
+	Id           int                      `form:"id"`           //消息id
+	MsgType      int                      `form:"msgType"`      //消息类型
+	Title        string                   `form:"title"`        //标题
+	Content      string                   `form:"content"`      //内容
+	Link         string                   `form:"link"`         //链接
+	SendMode     int                      `form:"sendMode"`     //发送时效 发送模式  1- 定时 2-实时
+	SendTime     string                   `form:"sendTime"`     // 发送时间
+	AndroidUrl   string                   `form:"androidUrl"`   //安卓连接
+	IosUrl       string                   `form:"iosUrl"`       //ios连接
+	WeChatUrl    string                   `form:"weChatUrl"`    //微信连接
+	UserIds      string                   `form:"userIds"`      //发送用户id
+	UserArr      []map[string]interface{} `form:"userArr"`      //已选择的用户信息集合
+	UserAddWay   int                      `form:"userAddWay"`   //添加用户的方式
+	TemplateName string                   `form:"templateName"` //模板名称 - 自定义消息
 }
 
 func CustomSendMsg(context *admin.Context) (interface{}, error) {

src/customerService/customService.go

@@ -52,6 +52,8 @@ func CustomSendMsgService(param *customMsg, sendStatus int, loginUserName string
 				"link":                param.Link,
 				"isdel":               1,
 				"send_userid":         loginUserId,
+				"user_add_way":        param.UserAddWay,
+				"template_name":       param.TemplateName,
 			})
 			return ok1 && ok && count > 0
 		})
@@ -88,19 +90,21 @@ func CustomSendMsgService(param *customMsg, sendStatus int, loginUserName string
 			"send_usergroup_id":   "",
 			"send_usergroup_name": "",
 			// "receive_user_id":     userIdStr,
-			"msg_type":    param.MsgType,
-			"title":       param.Title,
-			"content":     param.Content,
-			"send_mode":   param.SendMode,
-			"send_time":   param.SendTime,
-			"send_status": sendStatus,
-			"update_time": time.Now().Format(qutil.Date_Full_Layout),
-			"createtime":  time.Now().Format(qutil.Date_Full_Layout),
-			"link":        param.Link,
-			"isdel":       1,
-			"send_userid": loginUserId,
-			"send_name":   loginUserName,
-			"sign":        1,
+			"msg_type":      param.MsgType,
+			"title":         param.Title,
+			"content":       param.Content,
+			"send_mode":     param.SendMode,
+			"send_time":     param.SendTime,
+			"send_status":   sendStatus,
+			"update_time":   time.Now().Format(qutil.Date_Full_Layout),
+			"createtime":    time.Now().Format(qutil.Date_Full_Layout),
+			"link":          param.Link,
+			"isdel":         1,
+			"send_userid":   loginUserId,
+			"send_name":     loginUserName,
+			"sign":          1,
+			"user_add_way":  param.UserAddWay,
+			"template_name": param.TemplateName,
 		})
 		msgLogId = strconv.FormatInt(msgId, 10)
 		//如果是定时发送
@@ -231,7 +235,7 @@ func MyCustomerService(state, updateTimeStart, updateTimeEnd, companyName, phone
 		str := ""
 		sqlc := "SELECT COUNT(*) FROM customer where owner in (" + code + ") "
 
-		if state != "" {
+		if state != "" && state != "0" {
 			str += " and status999 = '" + state + "'"
 		}
 		if updateTimeStart != "" {
@@ -260,12 +264,14 @@ func MyCustomerService(state, updateTimeStart, updateTimeEnd, companyName, phone
 				for _, v := range *res {
 					userId := qutil.ObjToString(v["id"])
 					//获取用户注册手机号
-					userData, ok := util.MQFW.FindById("user", userId, `"s_phone":1,"s_m_phone":1`)
-					if userData != nil && len(*userData) > 0 && ok {
-						if qutil.ObjToString((*userData)["s_phone"]) != "" {
-							v["registePhone"] = qutil.ObjToString((*userData)["s_phone"])
-						} else {
-							v["registePhone"] = qutil.ObjToString((*userData)["s_m_phone"])
+					if userId != "" {
+						userData, ok := util.MQFW.FindById("user", userId, `"s_phone":1,"s_m_phone":1`)
+						if userData != nil && len(*userData) > 0 && ok {
+							if qutil.ObjToString((*userData)["s_phone"]) != "" {
+								v["registePhone"] = qutil.ObjToString((*userData)["s_phone"])
+							} else {
+								v["registePhone"] = qutil.ObjToString((*userData)["s_m_phone"])
+							}
 						}
 					} else {
 						v["registePhone"] = ""