From 6fbc633ee9bc203ece20d0d9160e1a9143e39378 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E4=BF=8A=E6=88=90?= <gakkiismywife1@163.com>
Date: Sun, 8 Oct 2023 16:48:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=89=8B=E6=9C=BA=E5=B0=BE?=
 =?UTF-8?q?=E5=8F=B7=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/apis/ordermanage/order.go | 6 +-----
 app/admin/models/order.go           | 6 +++---
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/app/admin/apis/ordermanage/order.go b/app/admin/apis/ordermanage/order.go
index 376e37d..f8e2a29 100644
--- a/app/admin/apis/ordermanage/order.go
+++ b/app/admin/apis/ordermanage/order.go
@@ -120,11 +120,7 @@ func RevertGoods(c *gin.Context) {
 	err := order.Revert()
 	if err != nil {
 		logger.Errorf("err:", err)
-		errMag := "更新失败"
-		if err.Error() == "untreated_issue_feedback" {
-			errMag = "请先检测用户反馈问题卡"
-		}
-		app.Error(c, http.StatusInternalServerError, err, errMag)
+		app.Error(c, http.StatusInternalServerError, err, err.Error())
 		return
 	}
 	app.OK(c, nil, "")
diff --git a/app/admin/models/order.go b/app/admin/models/order.go
index 3806022..18b2334 100644
--- a/app/admin/models/order.go
+++ b/app/admin/models/order.go
@@ -774,8 +774,8 @@ func (m *Order) Revert() error {
 		logger.Errorf("err:", err)
 		return err
 	}
-	if m.User != nil && !m.User.CheckPhoneExt(m.PhoneExt, 4) {
-		return errors.New("手机尾号不正确")
+	if order.User != nil && !order.User.CheckPhoneExt(m.PhoneExt, 4) {
+		return errors.New("手机尾号校验不正确")
 	}
 	cardMap, err := order.GetOrderCardMap()
 	if err != nil {
@@ -796,7 +796,7 @@ func (m *Order) Revert() error {
 	}
 	if issueCount > 0 {
 		logger.Error("untreated_issue_feedback")
-		return errors.New("untreated_issue_feedback")
+		return errors.New("请先检测用户反馈问题卡")
 	}
 	//for _, serialNumber := range m.GameCardSerialNumbers {
 	serialNumber := m.GameCardSerialNumber