feat: 修改推送

api/application.api

@@ -164,6 +164,7 @@ type (
 		PcHref     string  `json:"pcHref"`        //pc跳转地址
 		MobileHref string  `json:"mobileHref"`    //移动端跳转地址
 		User       []int64 `json:"user,optional"` //企业用户id
+		MsgType    string  `json:"msgType"`       //消息类型 1-活动优惠 2-服务通知 3-订阅消息 4-项目动态 5-企业动态 6-分析报告 7-系统通知 11-待办
 	}
 
 	CanAddReq {

api/internal/logic/pushmsglogic.go

@@ -46,7 +46,7 @@ func (l *PushMsgLogic) PushMsg(req *types.PushMsgReq) (resp *types.Reply, err er
 		baseUserIdArr = append(baseUserIdArr, resp.UserId)
 		//查询mgo
 	}
-	u := &service.User{ 	
+	u := &service.User{
 		BaseUserIds: baseUserIdArr,
 	}
 	m := u.GetUserId(req.EntId)
@@ -57,7 +57,7 @@ func (l *PushMsgLogic) PushMsg(req *types.PushMsgReq) (resp *types.Reply, err er
 		vb.WriteString(gconv.String(v) + ",")
 		userId := strings.TrimRight(kb.String(), ",")
 		positionId := strings.TrimRight(vb.String(), ",")
-		ok := service.StationMailPush(userId, positionId, req.Title, strings.Replace(req.Content, " ", "%20", -1), req.PcHref, req.MobileHref)
+		ok := service.StationMailPush(userId, positionId, req.Title, strings.Replace(req.Content, " ", "%20", -1), req.PcHref, req.MobileHref, req.MsgType)
 		if ok {
 			status = 1
 		}

api/internal/types/types.go

@@ -167,6 +167,7 @@ type PushMsgReq struct {
 	PcHref     string  `json:"pcHref"`        //pc跳转地址
 	MobileHref string  `json:"mobileHref"`    //移动端跳转地址
 	User       []int64 `json:"user,optional"` //企业用户id
+	MsgType    string  `json:"msgType"`       //消息类型 1-活动优惠 2-服务通知 3-订阅消息 4-项目动态 5-企业动态 6-分析报告 7-系统通知 11-待办
 }
 
 type CanAddReq struct {

api/timetask/timetask.go

@@ -74,7 +74,7 @@ func sendMess() {
 				}
 				m := user.GetUserId(resp.EntId)
 				for k, v := range m {
-					service.StationMailPush(k, gconv.String(v), strings.Replace(title, " ", "%20", -1), strings.Replace(fmt.Sprintf(content, name), " ", "%20", -1), fmt.Sprintf(pcHref, gconv.String(v), taskId, sourceId), mobileHref)
+					service.StationMailPush(k, gconv.String(v), strings.Replace(title, " ", "%20", -1), strings.Replace(fmt.Sprintf(content, name), " ", "%20", -1), fmt.Sprintf(pcHref, gconv.String(v), taskId, sourceId), mobileHref, "11")
 				}
 			}
 			return true

service/custom.go

@@ -135,7 +135,7 @@ func (this *CustomService) Add(ctx context.Context) (int64, string) {
 			content = fmt.Sprintf(cm.Push.Custom.Create.TransferContent, this.CreateName, strings.Replace(date.NowFormat(YYYYMMDDHHMM), " ", "%20", -1), next)
 		}
 
-		StationMailPush(userId, positionId, cm.Push.Custom.Create.Title, content, pcHref, cm.Push.Custom.Create.MobileHref)
+		StationMailPush(userId, positionId, cm.Push.Custom.Create.Title, content, pcHref, cm.Push.Custom.Create.MobileHref, "2")
 	}
 
 	return 1, groupId

service/sale_chance.go

@@ -138,7 +138,7 @@ func (this *SaleChanceService) Add(ctx context.Context) (int64, string) {
 			content = fmt.Sprintf(cm.Push.SaleChance.Create.TransferContent, this.CreateName, strings.Replace(date.NowFormat(YYYYMMDDHHMM), " ", "%20", -1), next)
 		}
 
-		StationMailPush(userId, positionId, cm.Push.SaleChance.Create.Title, content, pcHref, cm.Push.SaleChance.Create.MobileHref)
+		StationMailPush(userId, positionId, cm.Push.SaleChance.Create.Title, content, pcHref, cm.Push.SaleChance.Create.MobileHref, "2")
 
 	}
 

service/sale_clue.go

@@ -122,7 +122,7 @@ func (this *SaleClueService) Add(ctx context.Context) (int64, string) {
 			pcHref = fmt.Sprintf(cm.Push.SaleClue.Create.TransferPcHref, positionId)
 			content = fmt.Sprintf(cm.Push.SaleClue.Create.TransferContent, this.CreateName, strings.Replace(date.NowFormat(YYYYMMDDHHMM), " ", "%20", -1), next)
 		}
-		StationMailPush(userId, positionId, cm.Push.SaleClue.Create.Title, content, pcHref, cm.Push.SaleClue.Create.MobileHref)
+		StationMailPush(userId, positionId, cm.Push.SaleClue.Create.Title, content, pcHref, cm.Push.SaleClue.Create.MobileHref, "2")
 	}
 	return 1, groupId
 }

service/sendMsg.go

@@ -26,12 +26,13 @@ func FormatUserId(useridArr []string) (userids string) {
 	return
 }
 
-//站内信推送
-func StationMailPush(userId, positionId, title, content, pcHref, mobileHref string) bool {
+//站内信推送 msgType 11待办 2服务通知
+func StationMailPush(userId, positionId, title, content, pcHref, mobileHref string, msgType string) bool {
 	pcLandingPage := "/front/sess/" + Se.EncodeString(positionId+",positionId,"+strconv.Itoa(int(time.Now().Unix()))+",") + "__" + Se.EncodeString(pcHref)
-	wxAppLandingPage := "/front/sess/" + Se.EncodeString(positionId+",positionId,"+strconv.Itoa(int(time.Now().Unix()))+",") + "__" + Se.EncodeString(mobileHref)
-	href := fmt.Sprintf("%s?_action=%s&userIds=%s&msgType=11&title=%s&content=%s&link=%s&sendMode=2&sendTime=%s&androidUrl=%s&iosUrl=%s&weChatUrl=%s&_token=12311&reqSource=1&callPlatform=crm&menuname=message&positionIds=%s",
-		cm.Push.StationMailHref, cm.Push.StationMailAction, userId, title, content, pcLandingPage, date.NowFormat(date.Date_Short_Layout), wxAppLandingPage, wxAppLandingPage, wxAppLandingPage, positionId)
+	wxLandingPage := "/front/sess/" + Se.EncodeString(positionId+",positionId,"+strconv.Itoa(int(time.Now().Unix()))+",") + "__" + Se.EncodeString(mobileHref)
+	appLandingPage := "/jyapp/free/sess/" + Se.EncodeString(positionId+",positionId,"+strconv.Itoa(int(time.Now().Unix()))+",") + "__" + Se.EncodeString(mobileHref)
+	href := fmt.Sprintf("%s?_action=%s&userIds=%s&msgType=%s&title=%s&content=%s&link=%s&sendMode=2&sendTime=%s&androidUrl=%s&iosUrl=%s&weChatUrl=%s&_token=12311&reqSource=1&callPlatform=crm&menuname=message&positionIds=%s",
+		cm.Push.StationMailHref, cm.Push.StationMailAction, userId, msgType, title, content, pcLandingPage, date.NowFormat(date.Date_Short_Layout), appLandingPage, appLandingPage, wxLandingPage, positionId)
 	log.Println(href)
 	resp := Get(href, nil)
 	log.Println("resp:", resp)

service/util.go

@@ -56,6 +56,7 @@ func CanAdd(entId int64, key string, employInfoId, employCustomId, positionId in
 					return -1, fmt.Sprintf("%v已经基于该咨询创建了机会", v["create_person"])
 				}
 			}
+
 		} else if strings.Contains(key, "custom") {
 			if employInfoId > 0 {
 				d := cm.BaseMysql.SelectBySql(`select create_person,position_id from crm.custom where   employ_info_id in( `+ws+`) and ent_id =? `, args...)