Merge branch 'dev-lzh' into dev
This commit is contained in:
commit
63516ad0a8
@ -192,9 +192,7 @@ func AddBundleBalanceByUserId(data model.BundleBalance) error {
|
||||
return errors.New("用户还没有套餐信息")
|
||||
}
|
||||
newData := model.BundleBalance{
|
||||
Model: gorm.Model{
|
||||
ID: data.Model.ID,
|
||||
},
|
||||
Model: oldData.Model,
|
||||
UserId: oldData.UserId,
|
||||
OrderUUID: oldData.OrderUUID,
|
||||
AccountNumber: oldData.AccountNumber + data.AccountNumber,
|
||||
@ -214,7 +212,7 @@ func AddBundleBalanceByUserId(data model.BundleBalance) error {
|
||||
newData.DataAnalysisConsumptionNumber > newData.DataAnalysisNumber {
|
||||
return errors.New("套餐余量不足")
|
||||
}
|
||||
return tx.Model(&model.BundleBalance{}).Where("id = ?", oldData.ID).Updates(&newData).Error
|
||||
return tx.Model(&model.BundleBalance{}).Where("id = ?", oldData.ID).Save(&newData).Error
|
||||
})
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user