From 36ccf46df56aa955311446a42a427dc13361ffff Mon Sep 17 00:00:00 2001 From: Sean Du Date: Sun, 28 Jun 2026 18:12:58 +0800 Subject: [PATCH] Fix accessory exp lookup from user data Signed-off-by: Sean Du --- internal/model/accessory/accessory.go | 2 +- internal/session/accessory.go | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/internal/model/accessory/accessory.go b/internal/model/accessory/accessory.go index 2aec259..96b197f 100644 --- a/internal/model/accessory/accessory.go +++ b/internal/model/accessory/accessory.go @@ -2,7 +2,7 @@ package accessorymodel type Accessory struct { AccessoryID int `xorm:"accessory_id pk"` - Exp int `xorm:"exp"` + Exp int `xorm:"-"` SmileMax int `xorm:"smile_max"` PureMax int `xorm:"pure_max"` CoolMax int `xorm:"cool_max"` diff --git a/internal/session/accessory.go b/internal/session/accessory.go index 552cdbc..ac5c664 100644 --- a/internal/session/accessory.go +++ b/internal/session/accessory.go @@ -35,7 +35,12 @@ func (ss *Session) GetAccessoryByAccessoryOwningUserID(accessoryOwningUserID int return false, nil } - accessoryData := accessorymodel.Accessory{} + type accessoryWithUserExp struct { + accessorymodel.Accessory `xorm:"extends"` + Exp int `xorm:"-"` + } + + accessoryData := accessoryWithUserExp{} has, err := ss.MainEng.Table("accessory_m"). Where("accessory_id = ?", userAccessoryData.AccessoryID). Get(&accessoryData) @@ -48,7 +53,7 @@ func (ss *Session) GetAccessoryByAccessoryOwningUserID(accessoryOwningUserID int accessoryData.Exp = userAccessoryData.Exp - return has, &accessoryData + return has, &accessoryData.Accessory } func (ss *Session) GetUserAccessoryInfoByUnitOwningUserID(unitOwningUserID int) (bool, *liverecordschema.AccessoryInfo) {