|
@@ -325,6 +325,26 @@ func DelRollInfoById(id int) error {
|
325
|
325
|
return nil
|
326
|
326
|
}
|
327
|
327
|
|
|
328
|
+// 删除非活跃roll房
|
|
329
|
+func del_unactive_roll_info(id int) error {
|
|
330
|
+ pool := utils.GetAccountRedisPool()
|
|
331
|
+ if pool == nil {
|
|
332
|
+ return fmt.Errorf("get redis pool fail")
|
|
333
|
+ }
|
|
334
|
+ rd := pool.Get()
|
|
335
|
+ defer rd.Close()
|
|
336
|
+
|
|
337
|
+ pKey := get_roll_key(id)
|
|
338
|
+ _, err := rd.Do("del", pKey)
|
|
339
|
+ if err != nil {
|
|
340
|
+ log.Println(err)
|
|
341
|
+ return err
|
|
342
|
+ }
|
|
343
|
+ rd.Do("srem", ROLL_MAIN_KEY, id)
|
|
344
|
+
|
|
345
|
+ return nil
|
|
346
|
+}
|
|
347
|
+
|
328
|
348
|
// 获取roll房信息信息
|
329
|
349
|
func GetRollInfoById(id int) (hf *RollInfo) {
|
330
|
350
|
riMutex.Lock()
|
|
@@ -354,6 +374,7 @@ func GetRollInfoList() RollInfoArray {
|
354
|
374
|
for _, v := range rollList {
|
355
|
375
|
if v.AwardTime > currTime {
|
356
|
376
|
_rollList = append(_rollList, v)
|
|
377
|
+ del_unactive_roll_info(v.Id)
|
357
|
378
|
}
|
358
|
379
|
}
|
359
|
380
|
rollList = _rollList
|