fiee/micro-bundle
8
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev-lzh-0905' into dev

Browse Source
This commit is contained in:
lzh 2025-10-16 09:37:58 +08:00
commit 8018d286aa
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
internal/dao/bundleExtend.go
View File

@ -480,9 +480,6 @@ func BundleActivate(ids []uint32) error {
app.ModuleClients.BundleDB.Transaction(func(tx *gorm.DB) error {
activate := model.BundleActivate{}
if err := tx.Model(&model.BundleActivate{}).Where("user_id = ?", v).First(&activate).Error; err != nil {
return tx.Model(&model.BundleActivate{}).Where("user_id = ?", v).Create(&model.BundleActivate{UserId: int(v), Activate: 2}).Error
}
if activate.Activate != 2 { // 第一次激活重新计算余量的开始时间和过期时间
balance := model.BundleBalance{}
if err := tx.Model(&model.BundleBalance{}).Where("user_id = ?", v).First(&balance).Error; err != nil {
return err
@ -492,8 +489,7 @@ func BundleActivate(ids []uint32) error {
if err := tx.Model(&model.BundleBalance{}).Save(balance).Error; err != nil {
return err
}
activate.Activate = 2
return tx.Model(&model.BundleActivate{}).Save(activate).Error
return tx.Model(&model.BundleActivate{}).Where("user_id = ?", v).Create(&model.BundleActivate{UserId: int(v), Activate: 2}).Error
}
return nil
})