Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun

internal/msg_transfer/logic/online_history_msg_handler.go

@@ -190,8 +190,8 @@ func (och *OnlineHistoryConsumerHandler) MongoMessageRun(channelID int) {
 							log.NewError(triggerID, "deleteMessageTips unmarshal err:", err.Error(), v.String())
 							continue
 						}
-						if err := db.DB.DelMsgBySeqList(DeleteMessageTips.UserID, DeleteMessageTips.SeqList, v.OperationID); err != nil {
+						if unexistSeqList, err := db.DB.DelMsgBySeqList(DeleteMessageTips.UserID, DeleteMessageTips.SeqList, v.OperationID); err != nil {
-							log.NewError(v.OperationID, utils.GetSelfFuncName(), "DelMsgBySeqList args: ", DeleteMessageTips.UserID, DeleteMessageTips.SeqList, v.OperationID, err.Error())
+							log.NewError(v.OperationID, utils.GetSelfFuncName(), "DelMsgBySeqList args: ", DeleteMessageTips.UserID, DeleteMessageTips.SeqList, v.OperationID, err.Error(), unexistSeqList)
 						}
 
 					}

pkg/common/db/mongoModel.go

@@ -110,7 +110,7 @@ func (d *DataBases) DelMsgBySeqList(userID string, seqList []uint32, operationID
 			defer wg.Done()
 			unexistSeqList, err := d.DelMsgBySeqListInOneDoc(suffixUserID, subSeqList, operationID)
 			if err != nil {
-				log.Error(operationID, "DelMsgBySeqListInOneDoc failed ", e.Error(), suffixUserID, subSeqList)
+				log.Error(operationID, "DelMsgBySeqListInOneDoc failed ", err.Error(), suffixUserID, subSeqList)
 				return
 			}
 			lock.Lock()