fix:edit batch_msg/create

internal/logic/batch_msg/create_batch_msg_logic.go

@@ -36,10 +36,12 @@ func NewCreateBatchMsgLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Cr
 }
 
 func (l *CreateBatchMsgLogic) CreateBatchMsg(req *types.BatchMsgInfo) (*types.BaseMsgResp, error) {
+	var err error
+	organizationId := l.ctx.Value("organizationId").(uint64)
 
 	all := false
-	for _, label := range req.Labels {
-		if strings.EqualFold(label, "all") || strings.EqualFold(label, "全部") {
+	for _, labelName := range req.Labels {
+		if strings.EqualFold(labelName, "all") || strings.EqualFold(labelName, "全部") {
 			all = true
 			tagstring := "all"
 			req.Tag = &tagstring
@@ -51,7 +53,6 @@ func (l *CreateBatchMsgLogic) CreateBatchMsg(req *types.BatchMsgInfo) (*types.Ba
 	startTime := time.Now()
 	// req.StartTimeStr 不为nil并且不为空
 	if req.StartTimeStr != nil && *req.StartTimeStr != "" {
-		var err error
 		// 将 req.StartTimeStr 转换为 req.StartTime
 		startTime, err = time.Parse("2006-01-02 15:04:05", *req.StartTimeStr)
 		if err != nil {
@@ -64,7 +65,7 @@ func (l *CreateBatchMsgLogic) CreateBatchMsg(req *types.BatchMsgInfo) (*types.Ba
 	// 定时发送时间
 	var sendTime time.Time
 	if req.SendTimeStr != nil && *req.SendTimeStr != "" {
-		var err error
+
 		sendTime, err = time.Parse("2006-01-02 15:04:05", *req.SendTimeStr)
 		if err != nil {
 			// 处理错误，例如打印错误并返回
@@ -75,7 +76,6 @@ func (l *CreateBatchMsgLogic) CreateBatchMsg(req *types.BatchMsgInfo) (*types.Ba
 
 	// 把 req.Msg 字符串的内容 json_decode 到 msgArray
 	// 然后再把每一条信息都给所有指定的用户记录到 message_records 表
-	var err error
 	var msgArray []custom_types.Action
 
 	if req.Msg != nil && *req.Msg != "" {
@@ -123,6 +123,8 @@ func (l *CreateBatchMsgLogic) CreateBatchMsg(req *types.BatchMsgInfo) (*types.Ba
 		if err != nil {
 			return nil, dberrorhandler.DefaultEntError(l.Logger, err, req)
 		}
+		//l.Logger.Infof("CreateBatchMsgLogic labids= %v", labids)
+
 		// 获取 label_relationship 表中，label_id 等于 labids 的 contact_id
 		labelrelationships, err := l.svcCtx.DB.LabelRelationship.Query().Where(labelrelationship.LabelIDIn(labids...)).All(l.ctx)
 		if err != nil {
@@ -132,12 +134,15 @@ func (l *CreateBatchMsgLogic) CreateBatchMsg(req *types.BatchMsgInfo) (*types.Ba
 		for _, labelrelationship := range labelrelationships {
 			contact_ids = append(contact_ids, labelrelationship.ContactID)
 		}
+		//l.Logger.Infof("CreateBatchMsgLogic contact_ids= %v", contact_ids)
+
 		if len(contact_ids) > 0 {
 			// 获取 contact 表中 wx_wxid 等于 req.Fromwxid 并且 id 等于 contact_ids 并且 type 为1或2 的数据
 			userlist, err = l.svcCtx.DB.Contact.Query().Where(contact.WxWxid(*req.Fromwxid), contact.IDIn(contact_ids...), contact.TypeIn(1, 2)).All(l.ctx)
 			if err != nil {
 				return nil, dberrorhandler.DefaultEntError(l.Logger, err, req)
 			}
+			//l.Logger.Infof("CreateBatchMsgLogic userlist= %v", userlist)
 		}
 	}
 	total := int32(len(userlist))
@@ -155,7 +160,7 @@ func (l *CreateBatchMsgLogic) CreateBatchMsg(req *types.BatchMsgInfo) (*types.Ba
 		return nil, dberrorhandler.DefaultEntError(l.Logger, err, req)
 	}
 
-	_, err = l.svcCtx.DB.BatchMsg.Create().
+	batchMsg, err := l.svcCtx.DB.BatchMsg.Create().
 		SetNotNilBatchNo(&batchNo).
 		SetNotNilFromwxid(req.Fromwxid).
 		SetNotNilMsg(req.Msg).
@@ -171,7 +176,7 @@ func (l *CreateBatchMsgLogic) CreateBatchMsg(req *types.BatchMsgInfo) (*types.Ba
 	}
 
 	// 批量记录信息到 message_records 表里
-	for _, user := range userlist {
+	for idx, user := range userlist {
 		// 每个用户的所有 信息 组合到一个数组里然后批量插入，减少DB的压力
 		bulkCreate := make([]*ent.MessageRecordsCreate, 0)
 		for _, msg := range msgActionList {
@@ -180,12 +185,17 @@ func (l *CreateBatchMsgLogic) CreateBatchMsg(req *types.BatchMsgInfo) (*types.Ba
 				SetNotNilBotWxid(req.Fromwxid).
 				SetNotNilContactID(&user.ID).
 				SetNotNilContactType(&user.Type).
-				SetNotNilContactWxid(&user.Wxid).
 				SetNotNilContentType(&msg.Type).
 				SetNotNilContent(&msg.Content).
 				SetNotNilMeta(msg.Meta).
-				SetSendTime(sendTime),
+				SetSendTime(sendTime).
+				SetNotNilContactWxid(&user.Wxid). //接收方wxid
+				SetSourceType(2).                 // 2:批量消息
+				SetSourceID(batchMsg.ID).         // 批量消息ID，batch_msg 表主键
+				SetSubSourceID(uint64(idx)).      // 用索引作为 sub_source_id
+				SetOrganizationID(organizationId),
 			)
+			randSubSourceId++
 		}
 		err = l.svcCtx.DB.MessageRecords.CreateBulk(bulkCreate...).Exec(l.ctx)
 		if err != nil {