提交

陆恒
1 parent b71bf2ea
Showing 2 changed files with 12 additions and 4 deletions Show diff stats
src/HttpServer/logic/function.go
src/HttpServer/logic/logic.go
@@ -438,12 +438,12 @@ func (u *UserData) DoFlopCardd(resp *DoFlopResp) {
 		addgold = u.Goldrate * 45 * 60
 	case FLOPTYPE_FENCAT15MIN:
 		catid = 14 + REDCATIDEXTRA
-		ctime = 15 * 60
+		ctime = 40 //15 * 60
 		catfg = jsonconf.GetRedCatConfig(catid)
 		u.SetRedCatPos(catid, ctime, catfg.Money, nowt)
 	case FLOPTYPE_FENCAT10MIN:
 		catid = 13 + REDCATIDEXTRA
-		ctime = 10 * 60
+		ctime = 20 //10 * 60
 		catfg = jsonconf.GetRedCatConfig(catid)
 		u.SetRedCatPos(catid, ctime, catfg.Money, nowt)
 	case FLOPTYPE_REDCAT:
@@ -1745,9 +1745,9 @@ func HandlerLimitCatList(w http.ResponseWriter, data string, uuid int) {
 			break
 		}
  
-		poslist := uinfo.GetLimitCatList()
+		poslist := uinfo.GetRedCatIdList()
 		logger.Info("HandlerLimitCatList poslist=%+v", poslist)
-		nowtime := int(time.Now().Unix())
+		/*nowtime := int(time.Now().Unix())
 		for _, pos := range poslist {
 			if pos >= 0 && pos < len(uinfo.PosInfo) {
 				//如果可领取了再加入列表
@@ -1766,6 +1766,14 @@ func HandlerLimitCatList(w http.ResponseWriter, data string, uuid int) {
 				}
  
 			}
+		}*/
+		for _, v := range poslist {
+			var tmp LimitCatListData
+			tmp.CatId = v.Cat
+			tmp.Status = 0
+			tmp.Cash = v.Money
+			tmp.Date = time.Now().Format("2006-01-02T 15:04:05")
+			resp.Data = append(resp.Data, tmp)
 		}
  
 		resp.Code = 0
...	...	@@ -438,12 +438,12 @@ func (u UserData) DoFlopCardd(resp DoFlopResp) {
438	438	addgold = u.Goldrate * 45 * 60
439	439	case FLOPTYPE_FENCAT15MIN:
440	440	catid = 14 + REDCATIDEXTRA
441		- ctime = 15 * 60
	441	+ ctime = 40 //15 * 60
442	442	catfg = jsonconf.GetRedCatConfig(catid)
443	443	u.SetRedCatPos(catid, ctime, catfg.Money, nowt)
444	444	case FLOPTYPE_FENCAT10MIN:
445	445	catid = 13 + REDCATIDEXTRA
446		- ctime = 10 * 60
	446	+ ctime = 20 //10 * 60
447	447	catfg = jsonconf.GetRedCatConfig(catid)
448	448	u.SetRedCatPos(catid, ctime, catfg.Money, nowt)
449	449	case FLOPTYPE_REDCAT:
...	...
...	...	@@ -1745,9 +1745,9 @@ func HandlerLimitCatList(w http.ResponseWriter, data string, uuid int) {
1745	1745	break
1746	1746	}
1747	1747
1748		- poslist := uinfo.GetLimitCatList()
	1748	+ poslist := uinfo.GetRedCatIdList()
1749	1749	logger.Info("HandlerLimitCatList poslist=%+v", poslist)
1750		- nowtime := int(time.Now().Unix())
	1750	+ /*nowtime := int(time.Now().Unix())
1751	1751	for _, pos := range poslist {
1752	1752	if pos >= 0 && pos < len(uinfo.PosInfo) {
1753	1753	//如果可领取了再加入列表
...	...	@@ -1766,6 +1766,14 @@ func HandlerLimitCatList(w http.ResponseWriter, data string, uuid int) {
1766	1766	}
1767	1767
1768	1768	}
	1769	+ }*/
	1770	+ for _, v := range poslist {
	1771	+ var tmp LimitCatListData
	1772	+ tmp.CatId = v.Cat
	1773	+ tmp.Status = 0
	1774	+ tmp.Cash = v.Money
	1775	+ tmp.Date = time.Now().Format("2006-01-02T 15:04:05")
	1776	+ resp.Data = append(resp.Data, tmp)
1769	1777	}
1770	1778
1771	1779	resp.Code = 0
...	...