From eeeaa2a86f4e12be80afc85b96c451e9f4b4d011 Mon Sep 17 00:00:00 2001
From: Havoc412 <2993167370@qq.com>
Date: Sat, 9 Nov 2024 05:51:43 +0800
Subject: [PATCH] =?UTF-8?q?feat(animal):=20=E4=BC=98=E5=8C=96=E5=8A=A8?=
 =?UTF-8?q?=E7=89=A9=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E5=B9=B6=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E7=94=A8=E6=88=B7=E5=8F=8B=E5=A5=BD=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在动物模型中添加排序条件，按更新时间降序排列
- 在错误代码中添加针对用户的错误信息
- 在动物控制器中使用用户友好的错误信息
---
 app/global/errcode/animal.go                 | 4 ++++
 app/global/errcode/msg.go                    | 6 ++++++
 app/http/controller/web/animal_controller.go | 2 +-
 app/model/animal.go                          | 2 +-
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/app/global/errcode/animal.go b/app/global/errcode/animal.go
index 89ba807..ee52bf9 100644
--- a/app/global/errcode/animal.go
+++ b/app/global/errcode/animal.go
@@ -9,3 +9,7 @@ func AnimalMsgInit(m msg) {
 	m[ErrAnimalSqlFind] = "Animals 表单查询失败"
 	m[AnimalNoFind] = "Animals 没有查询到符合条件的目标"
 }
+
+func AnimalMsgUserInit(m msg) {
+	m[AnimalNoFind] = "没有更多符合此条件的毛茸茸啦，试着更换查询条件或者新增吧~"
+}
diff --git a/app/global/errcode/msg.go b/app/global/errcode/msg.go
index 755186b..75efcd2 100644
--- a/app/global/errcode/msg.go
+++ b/app/global/errcode/msg.go
@@ -4,6 +4,8 @@ type msg map[int]string
 
 var ErrMsg msg
 
+var ErrMsgForUser msg
+
 func init() {
 	ErrMsg = make(msg)
 	GeneralMsgInit(ErrMsg)
@@ -11,6 +13,10 @@ func init() {
 	UserMsgInit(ErrMsg)
 	EnocunterMsgInit(ErrMsg)
 	NlpMsgInit(ErrMsg)
+
+	// INGO
+	ErrMsgForUser = make(msg)
+	AnimalMsgUserInit(ErrMsgForUser)
 }
 
 func GeneralMsgInit(m msg) {
diff --git a/app/http/controller/web/animal_controller.go b/app/http/controller/web/animal_controller.go
index 336fce9..7db75c5 100644
--- a/app/http/controller/web/animal_controller.go
+++ b/app/http/controller/web/animal_controller.go
@@ -94,7 +94,7 @@ func (a *Animals) List(context *gin.Context) {
 			"key":     key,
 		})
 	} else {
-		response.Fail(context, errcode.AnimalNoFind, errcode.ErrMsg[errcode.AnimalNoFind], "")
+		response.Fail(context, errcode.AnimalNoFind, errcode.ErrMsg[errcode.AnimalNoFind], errcode.ErrMsgForUser[errcode.AnimalNoFind])
 	}
 }
 
diff --git a/app/model/animal.go b/app/model/animal.go
index 9a149b9..114878f 100644
--- a/app/model/animal.go
+++ b/app/model/animal.go
@@ -69,7 +69,7 @@ func (a *Animal) Show(attrs []string, gender []uint8, breed []uint8, sterilizati
 		db = db.Where("id not in (?)", notInIds)
 	}
 
-	err := db.Find(&temp).Error
+	err := db.Order("updated_at DESC").Find(&temp).Error
 	if err != nil {
 		variable.ZapLog.Error("Animal Show Error", zap.Error(err))
 	}