|
@@ -173,14 +173,18 @@ func (a *PlayerManage) RewardList(ctx context.Context, req entity.RewardListReq)
|
|
|
filter["userName"] = bson.M{"$regex": escapeRegex(req.UserName), "$options": "i"}
|
|
|
}
|
|
|
|
|
|
- startTime := mhayaTime.Now().StartOfDay().Unix()
|
|
|
- endTime := mhayaTime.Now().EndOfDay().Add(3 * 24 * time.Hour).Unix()
|
|
|
- if req.StartTime > 0 && req.StartTime < req.EndTime {
|
|
|
- startTime = req.StartTime
|
|
|
+ startTime := mhayaTime.Now().Add(-3 * 24 * time.Hour).Unix()
|
|
|
+ endTime := mhayaTime.Now().Unix()
|
|
|
+ if req.StartTime > 0 && req.StartTime >= startTime {
|
|
|
+ if req.StartTime <= req.EndTime || req.EndTime == 0 {
|
|
|
+ startTime = req.StartTime
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
if req.EndTime > 0 && req.EndTime <= endTime {
|
|
|
- endTime = req.EndTime
|
|
|
+ if req.StartTime <= req.EndTime {
|
|
|
+ endTime = req.EndTime
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
filter["createTime"] = bson.M{
|