|
|
@@ -37,7 +37,6 @@ func GetLotteryActiveInfo(activeId int64, sess map[string]interface{}, session *
|
|
|
)
|
|
|
activeInfo = LotteryActiveInfoRes{
|
|
|
Lai: &Lai{},
|
|
|
- Prize: prizeRs,
|
|
|
NowUnix: now.Unix(),
|
|
|
}
|
|
|
r.DLai, _ = r.ActiveInfo()
|
|
|
@@ -79,26 +78,7 @@ func GetLotteryActiveInfo(activeId int64, sess map[string]interface{}, session *
|
|
|
ShareCopy: r.DLai.ShareCopy,
|
|
|
Pic: pic,
|
|
|
}
|
|
|
- //activeInfo.Prize = prizeRs
|
|
|
- //lotteryStart := time.Date(now.Year(), now.Month(), now.Day(), r.DLai.LotteryStartTime, 0, 0, 0, time.Local)
|
|
|
- //time.Duration(r.DLai.LotteryStartTime) * time.Hour) // 将当前时间截断到0点并加上小时（去除了最后一纳秒）
|
|
|
- //LotteryStartUnix := lotteryStart.Unix()
|
|
|
- //activeInfo = LotteryActiveInfoRes{
|
|
|
- // Lai: &Lai{
|
|
|
- // Name: r.DLai.Name,
|
|
|
- // LotteryStartTime: r.DLai.LotteryStartTime,
|
|
|
- // LotteryEndTime: r.DLai.LotteryEndTime,
|
|
|
- // Cost: r.DLai.Cost,
|
|
|
- // Rule: r.DLai.Rule,
|
|
|
- // ShareCopy: r.DLai.ShareCopy,
|
|
|
- // Pic: pic,
|
|
|
- // },
|
|
|
- // Prize: prizeRs,
|
|
|
- // ActiveStartTime: ast.Unix(),
|
|
|
- // ActiveEndTime: aet.Unix(),
|
|
|
- // NowUnix: now.Unix(),
|
|
|
- // LotteryStartUnix: r.DLai.LotteryStartTime,
|
|
|
- //}
|
|
|
+ activeInfo.Prize = prizeRs
|
|
|
//活动已结束
|
|
|
if activeInfo.ActiveEndTime < now.Unix() {
|
|
|
activeInfo.Status = 2
|
