Browse Source

fix:edit batch_msg/create

jimmyyem 7 months ago
parent
commit
fa0b10ec95

+ 1 - 1
ent/schema/batch_msg.go

@@ -28,7 +28,7 @@ func (BatchMsg) Fields() []ent.Field {
 		field.Int32("fail").Optional().Comment("失败数量"),
 		field.Time("start_time").Optional().Comment("开始时间"),
 		field.Time("stop_time").Optional().Comment("结束时间"),
-		field.Time("send_time").Optional().Comment("发送时间"),
+		field.Time("send_time").Optional().Default(nil).Comment("发送时间"),
 		field.Int32("type").Optional().Comment("发送类型 1-群发消息 2-群发朋友圈"),
 	}
 }

+ 5 - 5
internal/logic/batch_msg/create_batch_msg_logic.go

@@ -63,15 +63,15 @@ func (l *CreateBatchMsgLogic) CreateBatchMsg(req *types.BatchMsgInfo) (*types.Ba
 	}
 
 	// 定时发送时间
-	var sendTime time.Time
+	var sendTime *time.Time
 	if req.SendTimeStr != nil && *req.SendTimeStr != "" {
-
-		sendTime, err = time.Parse("2006-01-02 15:04:05", *req.SendTimeStr)
+		sendTimeParse, err := time.Parse("2006-01-02 15:04:05", *req.SendTimeStr)
 		if err != nil {
 			// 处理错误,例如打印错误并返回
 			l.Logger.Errorf("时间字符串转换错误: %v", err)
 			return nil, err
 		}
+		sendTime = &sendTimeParse
 	}
 
 	// 把 req.Msg 字符串的内容 json_decode 到 msgArray
@@ -168,7 +168,7 @@ func (l *CreateBatchMsgLogic) CreateBatchMsg(req *types.BatchMsgInfo) (*types.Ba
 		SetTotal(total).
 		SetNotNilTaskName(req.TaskName).
 		SetNotNilStartTime(&startTime).
-		SetNotNilSendTime(&sendTime).
+		SetNotNilSendTime(sendTime).
 		SetNotNilType(req.Type).
 		Save(l.ctx)
 
@@ -190,7 +190,7 @@ func (l *CreateBatchMsgLogic) CreateBatchMsg(req *types.BatchMsgInfo) (*types.Ba
 				SetNotNilContentType(&msg.Type).
 				SetNotNilContent(&msg.Content).
 				SetNotNilMeta(msg.Meta).
-				SetSendTime(sendTime).
+				SetNotNilSendTime(sendTime).
 				SetNotNilContactWxid(&user.Wxid). //接收方wxid
 				SetSourceType(2).                 // 2:批量消息
 				SetSourceID(batchMsg.ID).         // 批量消息ID,batch_msg 表主键

+ 14 - 13
internal/logic/batch_msg/get_batch_msg_by_id_logic.go

@@ -44,19 +44,20 @@ func (l *GetBatchMsgByIdLogic) GetBatchMsgById(req *types.IDReq) (*types.BatchMs
 				CreatedAt: pointy.GetPointer(data.CreatedAt.UnixMilli()),
 				UpdatedAt: pointy.GetPointer(data.UpdatedAt.UnixMilli()),
 			},
-			Status:    &data.Status,
-			BatchNo:   &data.BatchNo,
-			TaskName:  &data.TaskName,
-			Fromwxid:  &data.Fromwxid,
-			Msg:       &data.Msg,
-			Tag:       &data.Tag,
-			Total:     &data.Total,
-			Success:   &data.Success,
-			Fail:      &data.Fail,
-			Type:      &data.Type,
-			StartTime: pointy.GetUnixMilliPointer(data.StartTime.UnixMilli()),
-			StopTime:  pointy.GetUnixMilliPointer(data.StopTime.UnixMilli()),
-			SendTime:  pointy.GetUnixMilliPointer(data.SendTime.UnixMilli()),
+			Status:      &data.Status,
+			BatchNo:     &data.BatchNo,
+			TaskName:    &data.TaskName,
+			Fromwxid:    &data.Fromwxid,
+			Msg:         &data.Msg,
+			Tag:         &data.Tag,
+			Total:       &data.Total,
+			Success:     &data.Success,
+			Fail:        &data.Fail,
+			Type:        &data.Type,
+			StartTime:   pointy.GetUnixMilliPointer(data.StartTime.UnixMilli()),
+			StopTime:    pointy.GetUnixMilliPointer(data.StopTime.UnixMilli()),
+			SendTime:    pointy.GetUnixMilliPointer(data.SendTime.UnixMilli()),
+			SendTimeStr: pointy.GetPointer(data.SendTime.Format("2006-01-02 15:04:05")),
 		},
 	}, nil
 }

+ 14 - 13
internal/logic/batch_msg/get_batch_msg_list_logic.go

@@ -62,19 +62,20 @@ func (l *GetBatchMsgListLogic) GetBatchMsgList(req *types.BatchMsgListReq) (*typ
 					CreatedAt: pointy.GetPointer(v.CreatedAt.UnixMilli()),
 					UpdatedAt: pointy.GetPointer(v.UpdatedAt.UnixMilli()),
 				},
-				Status:    &v.Status,
-				BatchNo:   &v.BatchNo,
-				TaskName:  &v.TaskName,
-				Fromwxid:  &v.Fromwxid,
-				Msg:       &v.Msg,
-				Tag:       &v.Tag,
-				Total:     &v.Total,
-				Success:   &v.Success,
-				Fail:      &v.Fail,
-				Type:      &v.Type,
-				StartTime: pointy.GetUnixMilliPointer(v.StartTime.UnixMilli()),
-				StopTime:  pointy.GetUnixMilliPointer(v.StopTime.UnixMilli()),
-				SendTime:  pointy.GetUnixMilliPointer(v.SendTime.UnixMilli()),
+				Status:      &v.Status,
+				BatchNo:     &v.BatchNo,
+				TaskName:    &v.TaskName,
+				Fromwxid:    &v.Fromwxid,
+				Msg:         &v.Msg,
+				Tag:         &v.Tag,
+				Total:       &v.Total,
+				Success:     &v.Success,
+				Fail:        &v.Fail,
+				Type:        &v.Type,
+				StartTime:   pointy.GetUnixMilliPointer(v.StartTime.UnixMilli()),
+				StopTime:    pointy.GetUnixMilliPointer(v.StopTime.UnixMilli()),
+				SendTime:    pointy.GetUnixMilliPointer(v.SendTime.UnixMilli()),
+				SendTimeStr: pointy.GetPointer(v.SendTime.Format("2006-01-02 15:04:05")),
 			})
 	}