From d3be7d733be25a44d4cbd10ab06bdb68e25701b2 Mon Sep 17 00:00:00 2001
From: ziming <zi__mm@163.com>
Date: Wed, 11 Jun 2025 18:11:45 +0800
Subject: [PATCH] timeSliceQueryPush

---
 internal/biz/timeslicequery/execute.go | 18 ++++++------------
 internal/pkg/script/script.go          | 12 ++++++++----
 internal/pkg/script/script_test.go     |  4 ++--
 internal/service/script.go             |  4 +---
 4 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/internal/biz/timeslicequery/execute.go b/internal/biz/timeslicequery/execute.go
index 24838f8..b33acdb 100644
--- a/internal/biz/timeslicequery/execute.go
+++ b/internal/biz/timeslicequery/execute.go
@@ -35,7 +35,6 @@ func (v *Query) callbackFunc(ctx context.Context, req *timeslice.Task) error {
 	currentEndTimeStr := req.CurrentEndTime.Format(time.DateTime)
 
 	start := time.Now()
-	startStr := start.Format(time.DateTime)
 
 	x := &do.WechatQuery{
 		StartTime: currentStartTimeStr,
@@ -43,14 +42,12 @@ func (v *Query) callbackFunc(ctx context.Context, req *timeslice.Task) error {
 		ProductNo: req.Process.Manager.ProductNo,
 	}
 
-	n := 0
 	num := 0
 	notifyNum := 0
 	errNum := 0
 
 	err := v.orderRepo.FinSucByStockIdInBatches(ctx, x, func(ctx context.Context, rows []*bo.OrderBo) error {
 
-		n += 1
 		for _, order := range rows {
 
 			num += 1
@@ -64,7 +61,7 @@ func (v *Query) callbackFunc(ctx context.Context, req *timeslice.Task) error {
 					"open_id":   order.Account,
 					"err":       err.Error(),
 				}
-				log.Errorf("%s到%s,第%d个任务，第%d组,发生错误:%+v", startTimeStr, endTimeStr, req.TaskID, n, 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)
@@ -79,15 +76,12 @@ func (v *Query) callbackFunc(ctx context.Context, req *timeslice.Task) error {
 	end := time.Now()
 
 	logFields := map[string]interface{}{
-		"任务处理时间":   currentStartTimeStr + "到" + currentEndTimeStr,
-		"总处理组数":    n,
-		"总处理条数":    num,
-		"总通知条数":    notifyNum,
-		"执行任务开始时间": startStr,
-		"执行任务结束时间": end.Format(time.DateTime),
-		"总处理耗时":    end.Sub(start).String(),
+		"searchTime": currentStartTimeStr + "到" + currentEndTimeStr,
+		"num":        num,
+		"notifyNum":  notifyNum,
+		"duration":   end.Sub(start).String(),
 	}
-	log.Warnf("%s到%s,第%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/pkg/script/script.go b/internal/pkg/script/script.go
index cf06e4e..240d57c 100644
--- a/internal/pkg/script/script.go
+++ b/internal/pkg/script/script.go
@@ -9,6 +9,12 @@ import (
 	"time"
 )
 
+const (
+	URL     = "http://127.0.0.1:15000/voucher/timeSliceQueryPush"
+	DEV_URL = "http://open.cszfan.com/voucher/cmb/timeSliceQueryPush"
+	PRO_URL = "https://voucher.86698.cn/voucher/cmb/timeSliceQueryPush"
+)
+
 func script(startTime, endTime time.Time, duration time.Duration) error {
 
 	// 每指定间隔时间发送一次请求
@@ -29,10 +35,8 @@ func script(startTime, endTime time.Time, duration time.Duration) error {
 
 func sendRequest(startTime, endTime time.Time) error {
 
-	url := "https://gateway.dev.cdlsxd.cn/voucher/cmb/v1/orderQuery"
-
 	// 创建请求体
-	requestBody := map[string]interface{}{
+	requestBody := map[string]string{
 		"product_no": "",
 		"start_time": startTime.Format(time.DateTime),
 		"end_time":   endTime.Format(time.DateTime),
@@ -45,7 +49,7 @@ func sendRequest(startTime, endTime time.Time) error {
 	}
 
 	// 发送 POST 请求
-	resp, err := http.Post(url, "application/json", bytes.NewBuffer(jsonData))
+	resp, err := http.Post(URL, "application/json", bytes.NewBuffer(jsonData))
 	if err != nil {
 		return fmt.Errorf("failed to send POST request: %v", err)
 	}
diff --git a/internal/pkg/script/script_test.go b/internal/pkg/script/script_test.go
index a557e56..e2fc243 100644
--- a/internal/pkg/script/script_test.go
+++ b/internal/pkg/script/script_test.go
@@ -13,13 +13,13 @@ func Test_script(t *testing.T) {
 		return
 	}
 
-	endTime, err := time.Parse(time.DateTime, "2025-05-31 00:00:00")
+	endTime, err := time.Parse(time.DateTime, "2025-05-01 10:00:00")
 	if err != nil {
 		t.Error(err)
 		return
 	}
 
-	duration := 24 * time.Hour
+	duration := 5 * time.Hour
 
 	if err = script(startTime, endTime, duration); err != nil {
 		t.Error(err)
diff --git a/internal/service/script.go b/internal/service/script.go
index e1ea10f..0a48089 100644
--- a/internal/service/script.go
+++ b/internal/service/script.go
@@ -95,9 +95,7 @@ func (this *CmbService) TimeSliceQueryPush(ctx http.Context) error {
 		return err
 	}
 
-	return ctx.JSON(http2.StatusOK, map[string]interface{}{
-		"data": reps,
-	})
+	return ctx.JSON(http2.StatusOK, reps)
 }
 
 func (this *CmbService) PushWechatRetry(ctx http.Context) error {