Merge branch 'dev-lzh-0905' into dev

This commit is contained in:
lzh 2025-10-21 13:30:20 +08:00
commit a8ffa7b798

View File

@ -204,12 +204,14 @@ func AddBundleBalance(req *bundle.AddBundleBalanceReq) (*bundle.AddBundleBalance
// 计算本月发放的限制类型数量 // 计算本月发放的限制类型数量
func cal(data model.BundleBalance, total, limit int, date time.Time) int { func cal(data model.BundleBalance, total, limit int, date time.Time) int {
var released int // 已释放的次数 var released int // 已释放的次数
if data.StartAt.Month() == date.Month() && data.StartAt.Year() == date.Year() {
} else if data.StartAt.Day() >= 16 { //第一个月释放的 if data.StartAt.Month() == date.Month() && data.StartAt.Year() == date.Year() { //第一个月释放的
} else if data.StartAt.Day() >= 16 {
released += limit/2 + 1 released += limit/2 + 1
} else { } else {
released += limit released += limit
} }
interval := date.Year()*12 + int(date.Month()) - (data.StartAt.Year()*12 + int(data.StartAt.Month())) // 后续月份释放的 interval := date.Year()*12 + int(date.Month()) - (data.StartAt.Year()*12 + int(data.StartAt.Month())) // 后续月份释放的
released += interval * limit released += interval * limit
remaining := max(total-released, 0) // 还剩余多少次没有发放 remaining := max(total-released, 0) // 还剩余多少次没有发放