Merge remote-tracking branch 'origin/master'

This commit is contained in:
renzhiyuan 2025-09-29 16:58:14 +08:00
commit 4f2e76d70d
1 changed files with 13 additions and 1 deletions

View File

@ -5,6 +5,7 @@ import (
"ai_scheduler/internal/entitys" "ai_scheduler/internal/entitys"
"encoding/json" "encoding/json"
"fmt" "fmt"
"sort"
"gitea.cdlsxd.cn/self-tools/l_request" "gitea.cdlsxd.cn/self-tools/l_request"
"github.com/gofiber/websocket/v2" "github.com/gofiber/websocket/v2"
@ -102,9 +103,20 @@ func (z ZltxOrderStatisticsTool) getZltxOrderStatistics(channel chan entitys.Res
if resData.Code != 200 { if resData.Code != 200 {
return fmt.Errorf("zltx order statistics error: %s", resData.Error) return fmt.Errorf("zltx order statistics error: %s", resData.Error)
} }
//按照日期排序
sort.Slice(resData.Data.RecentThreeDays, func(i, j int) bool {
return resData.Data.RecentThreeDays[i].Date < resData.Data.RecentThreeDays[j].Date
})
sort.Slice(resData.Data.RecentOneMonth, func(i, j int) bool {
return resData.Data.RecentOneMonth[i].Date < resData.Data.RecentOneMonth[j].Date
})
jsonByte, err := json.Marshal(resData)
if err != nil {
return err
}
channel <- entitys.Response{ channel <- entitys.Response{
Index: z.Name(), Index: z.Name(),
Content: res.Text, Content: string(jsonByte),
Type: entitys.ResponseJson, Type: entitys.ResponseJson,
} }
return nil return nil