diff --git a/internal/biz/timeslicequery/execute.go b/internal/biz/timeslicequery/execute.go index b33acdb..3133b69 100644 --- a/internal/biz/timeslicequery/execute.go +++ b/internal/biz/timeslicequery/execute.go @@ -17,11 +17,11 @@ func (v *Query) execute(ctx context.Context, req *timeslice.Manager) error { taskCount, err := timeslice.NewManager(v.callbackFunc).Run(ctx, req) if err != nil { - log.Errorf("%s到%s,发生错误:%v", managerStartStr, managerEndStr, err) + log.Errorf("%s到%s,微信券查询处理失败:%v", managerStartStr, managerEndStr, err) } - fmt.Printf("%s到%s,总任务数:%d\n", managerStartStr, managerEndStr, taskCount) - log.Warnf("%s到%s,总任务数:%d", managerStartStr, managerEndStr, taskCount) + fmt.Printf("%s到%s,微信券查询处理,总任务数:%d\n", managerStartStr, managerEndStr, taskCount) + log.Warnf("%s到%s,微信券查询处理,总任务数:%d", managerStartStr, managerEndStr, taskCount) return nil } @@ -61,10 +61,10 @@ func (v *Query) callbackFunc(ctx context.Context, req *timeslice.Task) error { "open_id": order.Account, "err": err.Error(), } - log.Errorf("%s到%s,taskId:%d,发生错误:%+v", startTimeStr, endTimeStr, req.TaskID, logFields) + log.Errorf("%s到%s,taskId:%d,微信券查询处理发生错误:%+v", startTimeStr, endTimeStr, req.TaskID, logFields) if errNum > 20 { - return fmt.Errorf("%s到%s,第%d个任务,已经连续发生20次错误%+v", startTimeStr, endTimeStr, req.TaskID, logFields) + return fmt.Errorf("%s到%s,第%d个任务,微信券查询处理,已经连续发生20次错误%+v", startTimeStr, endTimeStr, req.TaskID, logFields) } } @@ -81,7 +81,7 @@ func (v *Query) callbackFunc(ctx context.Context, req *timeslice.Task) error { "notifyNum": notifyNum, "duration": end.Sub(start).String(), } - log.Warnf("%s到%s,taskId:%d,处理完毕:%+v", startTimeStr, endTimeStr, req.TaskID, logFields) + log.Warnf("%s到%s,taskId:%d,微信券查询处理,处理完毕:%+v", startTimeStr, endTimeStr, req.TaskID, logFields) return err } diff --git a/internal/biz/timeslicequery/mq.go b/internal/biz/timeslicequery/mq.go index 3fb2fcc..24086c2 100644 --- a/internal/biz/timeslicequery/mq.go +++ b/internal/biz/timeslicequery/mq.go @@ -81,7 +81,7 @@ func (v *Query) getManager(msg string) (*timeslice.Manager, error) { return nil, err } - m := ×lice.Manager{ + manager := ×lice.Manager{ StartTime: start, EndTime: end, ProductNo: req.ProductNo, @@ -90,14 +90,14 @@ func (v *Query) getManager(msg string) (*timeslice.Manager, error) { } if req.GoNum > 0 { - m.GoNum = req.GoNum + manager.GoNum = req.GoNum } if req.TimeSliceHours > 0 { - m.TimeSliceHours = req.TimeSliceHours + manager.TimeSliceHours = req.TimeSliceHours } - return m, nil + return manager, nil } func (v *Query) Consumer(ctx context.Context, msg string) error { @@ -114,8 +114,8 @@ func (v *Query) Consumer(ctx context.Context, msg string) error { executeStart := time.Now() executeStartStr := executeStart.Format(time.DateTime) - log.Warnf("微信券查询处理开始:%s,manager:%s", executeStartStr, reqStr) - fmt.Printf("微信券查询处理开始:%s,manager:%s", executeStartStr, reqStr) + log.Warnf("微信券查询处理开始:%s,msg:%s,manager%s", executeStartStr, msg, reqStr) + fmt.Printf("微信券查询处理开始:%s,msg:%s,manager%s", executeStartStr, msg, reqStr) if err = v.execute(ctx, req); err != nil { log.Errorf("微信券查询处理失败:%s,msg:%s,err:%v", executeStartStr, msg, err) @@ -123,8 +123,8 @@ func (v *Query) Consumer(ctx context.Context, msg string) error { } executeEnd := time.Now() - log.Warnf("微信券查询处理耗时:%s,结束时间%s,manager:%s", executeEnd.Sub(executeStart).String(), executeEnd.String(), reqStr) - fmt.Printf("微信券查询处理耗时:%s,结束时间%s,manager:%s", executeEnd.Sub(executeStart).String(), executeEnd.String(), reqStr) + log.Warnf("微信券查询处理耗时:%s,结束时间%s,manager%s", executeEnd.Sub(executeStart).String(), executeEnd.String(), reqStr) + fmt.Printf("微信券查询处理耗时:%s,结束时间%s,manager%s", executeEnd.Sub(executeStart).String(), executeEnd.String(), reqStr) return nil } diff --git a/internal/pkg/script/script_test.go b/internal/pkg/script/script_test.go index 1b35f8d..19c7850 100644 --- a/internal/pkg/script/script_test.go +++ b/internal/pkg/script/script_test.go @@ -14,7 +14,7 @@ func Test_script(t *testing.T) { return } - endTime, err := time.Parse(time.DateTime, "2025-05-01 10:00:00") + endTime, err := time.Parse(time.DateTime, "2025-05-01 5:00:00") if err != nil { t.Error(err) return @@ -26,7 +26,6 @@ func Test_script(t *testing.T) { requestBody := map[string]any{ "go_num": 2, // 并发数量 "time_slice_hours": 2, // 时间间隔 - "order_no": "", "product_no": "", "start_time": startTime.Format(time.DateTime), "end_time": endTime.Format(time.DateTime),