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

余量查询最新月份

Browse Source
This commit is contained in:
lzh 2025-10-21 15:43:43 +08:00
parent 60f4775cbc
commit 60d56109fe
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
internal/dao/bundleExtend.go
View File

@ -93,7 +93,6 @@ func GetBundleBalanceList(req *bundle.GetBundleBalanceListReq) (data []model.Bun
Joins("LEFT JOIN bundle_activate bc on bc.user_id = u.id").
Where("rn.name IS NOT NULL").
Where("u.deleted_at = 0").
Where("bb.month = ?", req.Month).
Where("bor.deleted_at IS NULL").
Order("bor.expiration_time desc")
if req.UserName != "" {
@ -121,6 +120,12 @@ func GetBundleBalanceList(req *bundle.GetBundleBalanceListReq) (data []model.Bun
if req.Bought == 1 {
session = session.Where("bor.uuid IS NULL")
}
if req.Month == "" {
newestMonthQuery := app.ModuleClients.BundleDB.Model(&model.BundleBalance{}).Select("max(month) as month,user_id").Group("user_id")
session.Joins("LEFT JOIN (?) as newest_month on newest_month.user_id = bb.user_id", newestMonthQuery).Where("")
} else {
session = session.Where("bb.month = ?", req.Month)
}
err = session.Count(&total).Error
if err != nil {
return

2
internal/logic/bundleExtendLogic.go
View File

@ -66,7 +66,7 @@ func GetBundleBalanceList(req *bundle.GetBundleBalanceListReq) (*bundle.GetBundl
resp.Total = total
date, err := time.Parse("2006-01", req.Month)
if err != nil {
return nil, errors.New("请求时间有误")
date = time.Now()
}
resp.Data = lo.Map(data, func(m model.BundleBalancePo, _ int) *bundle.BundleBalanceItem {
result := &bundle.BundleBalanceItem{