Compare commits

..

No commits in common. "8018d286aa591bf0f0868d23387a8dc4dc47d772" and "d58f0e574a53ff322dba5c1ff5d2581ff98af8f0" have entirely different histories.

View File

@ -480,6 +480,9 @@ func BundleActivate(ids []uint32) error {
app.ModuleClients.BundleDB.Transaction(func(tx *gorm.DB) error { app.ModuleClients.BundleDB.Transaction(func(tx *gorm.DB) error {
activate := model.BundleActivate{} activate := model.BundleActivate{}
if err := tx.Model(&model.BundleActivate{}).Where("user_id = ?", v).First(&activate).Error; err != nil { 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{} balance := model.BundleBalance{}
if err := tx.Model(&model.BundleBalance{}).Where("user_id = ?", v).First(&balance).Error; err != nil { if err := tx.Model(&model.BundleBalance{}).Where("user_id = ?", v).First(&balance).Error; err != nil {
return err return err
@ -489,7 +492,8 @@ func BundleActivate(ids []uint32) error {
if err := tx.Model(&model.BundleBalance{}).Save(balance).Error; err != nil { if err := tx.Model(&model.BundleBalance{}).Save(balance).Error; err != nil {
return err return err
} }
return tx.Model(&model.BundleActivate{}).Where("user_id = ?", v).Create(&model.BundleActivate{UserId: int(v), Activate: 2}).Error activate.Activate = 2
return tx.Model(&model.BundleActivate{}).Save(activate).Error
} }
return nil return nil
}) })