fix:发送消息判断条件处理

src/customerService/customService.go

@@ -239,7 +239,7 @@ func CustomSendMsgService(param *customMsg, sendStatus int, loginUserName string
 			if appVersion > "3.0.3" {
 				go util.AppGrpcPush(dt, otherPushId, jgPushId, phoneType, appPushUrl)
 			}
-			if i == 100 {
+			if i >= 100 {
 				//调用消息中台
 				log.Println("发送用户id", userIds)
 				util.MultipleSaveMessage(msg, userIds, userNames)

src/customerService/newsService.go

@@ -378,7 +378,7 @@ func pushMsg(param *SendMessage, sendStatus int) (int, error) {
 			if appVersion > "3.0.3" {
 				go util.AppGrpcPush(dt, otherPushId, jgPushId, phoneType, appPushUrl)
 			}
-			if i == 100 {
+			if i >= 100 {
 				//调用消息中台
 				log.Println("100个用户开始发送消息：", i)
 				util.MultipleSaveMessage(msg, userIds, userNames)
@@ -458,9 +458,6 @@ func GroupSendMsg(param *public.Message, sendStatus int, loginUserId int, loginU
 			projectIdMap.Store(userId, true)
 		}
 		log.Println("单条数据用户id：", user.UserId)
-		i++
-		userIds += userId + ","
-
 		//查询mongo库用户信息
 		userData := &map[string]interface{}{}
 		ok := false
@@ -468,11 +465,13 @@ func GroupSendMsg(param *public.Message, sendStatus int, loginUserId int, loginU
 		if userData == nil || len(*userData) == 0 || !ok {
 			continue
 		}
+		i++
+		userIds += userId + ","
 		//name := qutil.ObjToString((*userData)["s_name"])
 		userNames += "" + ","
 		public.AppPushMsg(param, *userData, loginUserId, loginUserName, msgType)
 		log.Println("用户数量:", i)
-		if i == 100 {
+		if i >= 100 {
 			log.Println("100用户开始发送消息：", len(userIds))
 			//调用消息中台
 			util.MultipleSaveMessage(msg, userIds, userNames)

src/public/message.go

@@ -74,7 +74,7 @@ func AllUserSendMsg(param *Message, loginUserId int, loginUserName string, msgLo
 		go AppPushMsg(param, userInfo, loginUserId, loginUserName, msgType)
 		currentCount++
 		totalCount++
-		if currentCount == 100 {
+		if currentCount >= 100 {
 			//调用消息中台
 			util.MultipleSaveMessage(msg, userIds, userNames)
 			userNames = ""

src/task/task2.go

@@ -211,7 +211,7 @@ func TaskSaveMsg(msgId int, msg *map[string]interface{}, androidUrl, iosUrl stri
 			go util.AppGrpcPush(dt, otherPushId, jgPushId, phoneType, appPushUrl)
 		}
 		log.Println("用户数量:", i)
-		if i == 100 {
+		if i >= 100 {
 			//调用中台接口
 			log.Println("定时发送中100个用户开始发送消息")
 			util.MultipleSaveMessage(msg1, userIds, userNames)
@@ -333,7 +333,7 @@ func CustomTaskSaveMsg(msgId int, msg *map[string]interface{}, androidUrl, iosUr
 				go util.AppGrpcPush(dt, otherPushId, jgPushId, phoneType, appPushUrl)
 			}
 			log.Println("用户数量:", i)
-			if i == 100 {
+			if i >= 100 {
 				//调用中台接口
 				log.Println("定时发送中100个用户开始发送消息")
 				util.MultipleSaveMessage(msg1, userIds, userNames)