群发消息修改

rpc/internal/common/msglistService.go

@@ -63,13 +63,20 @@ func BitmapUserMsgList(this *message.UserMsgListReq) (*message.UserMsgList, *mes
 				}
 				lastMsg := GlobMsgMap[lastMsgId]
 				if lastMsg == nil || len(lastMsg) <= 0 {
-					m := entity.Mysql.FindOne("message_send_log", map[string]interface{}{"id": int(lastMsgId)}, "id,msg_type,title,content,send_time,link,menu_name,group_id", "")
-					if m != nil && len(*m) > 0 {
-						lastMsg = *m
+					mess := entity.Mysql.FindOne("message_send_log", map[string]interface{}{"id": int(lastMsgId)}, "id,msg_type,title,content,send_time,link,menu_name,group_id", "")
+					if mess != nil && len(*mess) > 0 {
+						lastMsg = *mess
 					} else {
 						continue
 					}
 				}
+				if common.IntAll(lastMsg["sign"]) == 4 {
+					//查询用户注册时间
+					rData, _ := entity.MQFW.FindOneByField("user", map[string]interface{}{"_id": m.StringTOBsonId(this.UserId)}, `{"l_registedate":1}`)
+					if rData != nil && len(*rData) > 0 {
+						lastMsg["send_time"] = time.Unix(common.Int64All((*rData)["l_registedate"]), 0).Local().Format("2006-01-02 15:04:05")
+					}
+				}
 				var msg = message.Messages{
 					Id:         strconv.FormatInt(util.Int64All(lastMsg["id"]), 10),
 					Createtime: common.InterfaceToStr(lastMsg["send_time"]),
@@ -158,7 +165,7 @@ func BitmapUserMsgList(this *message.UserMsgListReq) (*message.UserMsgList, *mes
 				totalMsg = userClassMsgMap[int(this.MsgType)]
 				if this.MsgType == 11 {
 					if !this.IsClassSearch {
-						totalMsg = IntArrSort(append(totalMsg, userClassMsgMap[12]...))
+						totalMsg = append(totalMsg, userClassMsgMap[12]...)
 					}
 				}
 				userMsgArr = totalMsg
@@ -170,6 +177,7 @@ func BitmapUserMsgList(this *message.UserMsgListReq) (*message.UserMsgList, *mes
 			}
 			fmt.Println("所有消息", userMsgArr)
 			if len(userMsgArr) > 0 {
+				userMsgArr = IntArrSort(userMsgArr)
 				//总页数
 				var pageCount = 0
 				if this.PageSize != 0 {