fiee/micro-bundle
9
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-21 13:40:55 +08:00
commit 4359e001ea
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
internal/dao/bundleExtend.go
View File

@ -540,7 +540,7 @@ inner join (
var released int // 已释放的次数
if v.StartAt.Month() == now.Month() && v.StartAt.Year() == now.Year() {
} else if v.StartAt.Day() >= 16 { //第一个月释放的
released += limit/2 + 1
released += (limit + 1) / 2
} else {
released += limit
}
@ -549,7 +549,7 @@ inner join (
remaining := max(total-released, 0) // 还剩余多少次没有发放
if v.StartAt.Month() == now.Month() && v.StartAt.Year() == now.Year() && v.StartAt.Day() >= 16 { // 本月为第一个月并且16号后购买只给一半（向上取整）
return min(limit/2+1, remaining)
return min((limit+1)/2, remaining)
}
if v.ExpiredAt.Month() == now.Month() && v.ExpiredAt.Year() == now.Year() && v.ExpiredAt.Day() < 16 { // 本月为最后一个月并且16号前到期只给一半（向下取整）
return min(limit/2, remaining)

4
internal/logic/bundleExtendLogic.go
View File

@ -207,7 +207,7 @@ func cal(data model.BundleBalance, total, limit int, date time.Time) int {
if data.StartAt.Month() == date.Month() && data.StartAt.Year() == date.Year() { //第一个月释放的
} else if data.StartAt.Day() >= 16 {
released += limit/2 + 1
released += (limit + 1) / 2
} else {
released += limit
}
@ -217,7 +217,7 @@ func cal(data model.BundleBalance, total, limit int, date time.Time) int {
remaining := max(total-released, 0) // 还剩余多少次没有发放
if data.StartAt.Month() == date.Month() && data.StartAt.Year() == date.Year() && data.StartAt.Day() >= 16 { // 本月为第一个月并且16号后购买只给一半（向上取整）
return min(limit/2+1, remaining)
return min((limit+1)/2, remaining)
}
if data.ExpiredAt.Month() == date.Month() && data.ExpiredAt.Year() == date.Year() && data.ExpiredAt.Day() < 16 { // 本月为最后一个月并且16号前到期只给一半（向下取整）
return min(limit/2, remaining)