diff --git a/api/controller/Public.go b/api/controller/Public.go index 7a17325..1c9a206 100644 --- a/api/controller/Public.go +++ b/api/controller/Public.go @@ -12,6 +12,7 @@ import ( "hepa-calc-admin-api/config" "hepa-calc-admin-api/global" "hepa-calc-admin-api/utils" + "sort" "time" ) @@ -225,7 +226,7 @@ func (b *Public) GetIndexData(c *gin.Context) { } // 返回值 - var g []*dto.IndexDataDto + g := make([]*dto.IndexDataDto, 0) results := make(map[string]int64) // 分类(1:新增用户数 2:新增算算数 3:新增单项支付数 4:新增会员购买数) @@ -316,10 +317,19 @@ func (b *Public) GetIndexData(c *gin.Context) { } } - for k, v := range results { + // 提取 map 的键 + keys := make([]string, 0, len(results)) + for key := range results { + keys = append(keys, key) + } + + // 对键进行排序 + sort.Strings(keys) + + for _, k := range keys { response := &dto.IndexDataDto{ Date: k, - Count: v, + Count: results[k], } g = append(g, response)