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