|
|
@@ -197,10 +197,10 @@ func (r *RaffleInfo) ActiveInfo() (ai *Lai, err error) {
|
|
|
sql := fmt.Sprintf("SELECT * FROM %s lai WHERE lai.id = ? AND lai.state = 0", consts.TableActivityInfo)
|
|
|
data := db.BaseMysql.SelectBySql(sql, r.ActiveId)
|
|
|
if data != nil && len(*data) > 0 {
|
|
|
- lst, _ := time.ParseInLocation(common.ObjToString((*data)[0]["lottery_start_time"]), date.Date_Time_Layout, time.Local)
|
|
|
- let, _ := time.ParseInLocation(common.ObjToString((*data)[0]["lottery_end_time"]), date.Date_Time_Layout, time.Local)
|
|
|
- st, _ := time.ParseInLocation(common.ObjToString((*data)[0]["start_time"]), date.Date_Full_Layout, time.Local)
|
|
|
- et, _ := time.ParseInLocation(common.ObjToString((*data)[0]["end_time"]), date.Date_Full_Layout, time.Local)
|
|
|
+ lst, _ := time.ParseInLocation(date.Date_Full_Layout, fmt.Sprintf("%s %s", time.Now().Format(date.Date_Short_Layout), common.ObjToString((*data)[0]["lottery_start_time"])), time.Local)
|
|
|
+ let, _ := time.ParseInLocation(date.Date_Full_Layout, fmt.Sprintf("%s %s", time.Now().Format(date.Date_Short_Layout), common.ObjToString((*data)[0]["lottery_end_time"])), time.Local)
|
|
|
+ st, _ := time.ParseInLocation(date.Date_Full_Layout, fmt.Sprintf("%s %s", time.Now().Format(date.Date_Short_Layout), common.ObjToString((*data)[0]["start_time"])), time.Local)
|
|
|
+ et, _ := time.ParseInLocation(date.Date_Full_Layout, fmt.Sprintf("%s %s", time.Now().Format(date.Date_Short_Layout), common.ObjToString((*data)[0]["end_time"])), time.Local)
|
|
|
ai = &Lai{
|
|
|
Id: common.Int64All((*data)[0]["id"]),
|
|
|
Name: common.ObjToString((*data)[0]["name"]),
|
