Merge branch 'feat-hjj-MetricsManager#260226' into dev
This commit is contained in:
commit
374d1472da
@ -120,17 +120,18 @@ func GetBundleBalanceList(req *bundle.GetBundleBalanceListReq) (data []model.Bun
|
|||||||
if req.Bought == 1 {
|
if req.Bought == 1 {
|
||||||
session = session.Where("bb.user_id IS NULL")
|
session = session.Where("bb.user_id IS NULL")
|
||||||
}
|
}
|
||||||
|
t := time.Now()
|
||||||
if req.StatusType != 0 {
|
if req.StatusType != 0 {
|
||||||
if req.ExpiredTimeStart > time.Now().UnixMilli() {
|
if req.ExpiredTimeStart > time.Now().UnixMilli() {
|
||||||
if req.StatusType == 1 {
|
if req.StatusType == 1 {
|
||||||
session = session.Where("bb.expired_at <= ?", time.Now().UnixMilli())
|
session = session.Where("bb.expired_at <= ?", t.Format("2006-01-02 15:04:05"))
|
||||||
} else {
|
} else {
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if req.StatusType == 1 {
|
if req.StatusType == 1 {
|
||||||
session = session.Where("bb.expired_at <= ?", time.Now().UnixMilli())
|
session = session.Where("bb.expired_at <= ?", t.Format("2006-01-02 15:04:05"))
|
||||||
} else {
|
} else {
|
||||||
session = session.Where("bb.expired_at >= ?", time.Now().UnixMilli())
|
session = session.Where("bb.expired_at >= ?", t.Format("2006-01-02 15:04:05"))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user