boweniac 6 months ago
parent
commit
0a0a9b8129

+ 6 - 0
desc/wechat/message_records.api

@@ -74,6 +74,12 @@ type (
         // 机器人微信 id 
         BotWxid  *string `json:"botWxid,optional"`
 
+        // 消息类型:源类型 1 点发 2 群发 3 SOP 阶段 4 SOP 节点
+        SourceType  *int `json:"sourceType,optional"`
+
+        // 消息源ID:
+        SourceId  *uint64 `json:"sourceId,optional"`
+
         // 接收方微信 id 
         ContactWxid  *string `json:"contactWxid,optional"`
 

+ 9 - 2
internal/logic/message_records/get_message_records_list_logic.go

@@ -34,8 +34,15 @@ func (l *GetMessageRecordsListLogic) GetMessageRecordsList(req *types.MessageRec
 	// 按机构ID搜
 	predicates = append(predicates, messagerecords.OrganizationIDEQ(organizationId))
 	// 按群发ID搜
-	predicates = append(predicates, messagerecords.SourceIDEQ(*req.BatchMsgId))
-
+	if req.BatchMsgId != nil {
+		predicates = append(predicates, messagerecords.SourceIDEQ(*req.BatchMsgId))
+	}
+	if req.SourceType != nil {
+		predicates = append(predicates, messagerecords.SourceTypeEQ(*req.SourceType))
+	}
+	if req.SourceId != nil {
+		predicates = append(predicates, messagerecords.SourceIDEQ(*req.SourceId))
+	}
 	if req.BotWxid != nil {
 		predicates = append(predicates, messagerecords.BotWxidContains(*req.BotWxid))
 	}

+ 4 - 0
internal/types/types.go

@@ -1359,6 +1359,10 @@ type MessageRecordsListReq struct {
 	BatchMsgId *uint64 `json:"batchMsgId,optional"`
 	// 机器人微信 id
 	BotWxid *string `json:"botWxid,optional"`
+	// 消息类型:源类型 1 点发 2 群发 3 SOP 阶段 4 SOP 节点
+	SourceType *int `json:"sourceType,optional"`
+	// 消息源ID:
+	SourceId *uint64 `json:"sourceId,optional"`
 	// 接收方微信 id
 	ContactWxid *string `json:"contactWxid,optional"`
 	// 发送内容