wangfuduo
/
twin-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: user_pkg dao

This commit is contained in:
wangfuduo 2026-07-07 16:38:56 +08:00
parent 3f89b36d8c
commit 31692fa9ca
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/common/dao/user_pkg.go
View File

@ -31,10 +31,6 @@ func (p *UserPkg) Update(m *model.UserPkg) error {
return p.db.Table(p.TableName()).Save(m).Error
}
func (p *UserPkg) Delete(m *model.UserPkg) error {
return nil
}
func (p *UserPkg) Get(id, userId int64) (*model.UserPkg, error) {
var res model.UserPkg
if err := p.db.Table(p.TableName()).Where("id = ? AND user_id = ?", id, userId).First(&res).Error; err != nil {
@ -47,13 +43,13 @@ func (p *UserPkg) Get(id, userId int64) (*model.UserPkg, error) {
return &res, nil
}
func (p *UserPkg) GetByUserId(userId int64) (*model.UserPkgInfo, error) {
func (p *UserPkg) GetLatest(userId int64) (*model.UserPkgInfo, error) {
var res model.UserPkgInfo
tx := p.db.Table(p.TableName() + " u ")
tx = tx.Joins(fmt.Sprintf(" JOIN %s p ON u.id = p.user_id", NewPackage().TableName()))
tx = tx.Joins(fmt.Sprintf(" JOIN %s p ON u.package_id = p.id", NewPackage().TableName()))
tx = tx.Where("u.user_id = ?", userId)
tx = tx.Order("u.id desc")
if err := tx.Select("u.*,p.*").First(&res).Error; err != nil {
if err := tx.Select("u.*,p.*").Limit(1).Find(&res).Error; err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) {
return nil, nil
}