From c631a574cd85ba3c9b3d6061d0596e688c388aa0 Mon Sep 17 00:00:00 2001
From: wucongxing8150 <815046773@qq.com>
Date: Wed, 25 Sep 2024 13:39:17 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=8A=A8=E6=80=81=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E6=95=B0=E6=8D=AE=E5=A2=9E=E5=8A=A0=E6=8E=92=E5=BA=8F?=
 =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E7=A9=BA=E6=97=B6=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/controller/Public.go | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

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)