修改roll房

conf/neo-win/cfg_test.conf

@@ -22,7 +22,7 @@ port_account=6381
 auth_account=aGMtbmVvLWRldi0yMDIzMDQwNw==
 
 [mysql-game]
-host=127.0.0.1
+host=192.168.10.14
 port=3306
 database=box
 user=neo

controllers/default.go

@@ -159,6 +159,11 @@ func getIndex(permission int64) []*NavInfo {
 			Name: "Roll奖励方案管理",
 			Url:  "rollaward.html",
 		})
+		navInfo.IndexList = append(navInfo.IndexList, &IndexInfo{
+			Id:   models.ModelSystem,
+			Name: "Roll房管理",
+			Url:  "roll.html",
+		})
 
 		navList = append(navList, navInfo)
 	}

controllers/roll.go

@@ -7,6 +7,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"log"
+	"time"
 
 	"github.com/astaxie/beego"
 )
@@ -29,8 +30,17 @@ func (c *RollController) Get() {
 		return
 	}
 
+	action := c.GetString("action")
+	if action == "update" {
+		c.Data["json"] = &map[string]interface{}{"status": true}
+		c.ServeJSON()
+		return
+	}
+
 	c.Data["AwardList"] = models.GetRollAwardInfo()
 	c.Data["infoList"] = models.GetRollInfoList()
+	c.Data["ConditionList"] = models.GetRollConditionList()
+	c.Data["ItemList"] = models.GetItemInfoList()
 	c.TplName = "roll.tpl"
 }
 
@@ -47,17 +57,21 @@ func (c *RollController) Post() {
 	signupStartTime := c.GetString("signupStartTime")
 	signupEndTime := c.GetString("signupEndTime")
 	awardTime := c.GetString("awardTime")
-	conditions := c.GetString("conditions")
+	conditionList := c.GetString("conditionList")
 	awardId, _ := c.GetInt("awardId")
 
+	log.Printf("RollController Post conditionList[%s]", conditionList)
 	var _conditions []*models.RollConditionInfo
-	err := json.Unmarshal([]byte(conditions), &_conditions)
+	err := json.Unmarshal([]byte(conditionList), &_conditions)
 	if err != nil {
-		log.Printf("RollController Post conditions[%s] err[%v]", conditions, err)
+		log.Printf("RollController Post conditionList[%s] err[%v]", conditionList, err)
 		c.Data["json"] = &map[string]interface{}{"status": false, "info": err.Error()}
 		c.ServeJSON()
 		return
 	}
+	for _, v := range _conditions {
+		log.Printf("RollController Post _conditions Conditions[%s] CValue[%d]", v.Conditions, v.CValue)
+	}
 	itemIdList := models.GetRollAwardItemIdList(awardId)
 	if itemIdList == nil {
 		log.Printf("RollController Post awardId[%d] 奖励列表空", awardId)
@@ -65,15 +79,35 @@ func (c *RollController) Post() {
 		c.ServeJSON()
 		return
 	}
+	_ShowStartTime := utils.GetTime64(showStartTime)
+	_SignupStartTime := utils.GetTime64(signupStartTime)
+	_SignupEndTime := utils.GetTime64(signupEndTime)
+	_AwardTime := utils.GetTime64(awardTime)
+	currTime := time.Now().Unix()
+	if _ShowStartTime > _ShowStartTime {
+		c.Data["json"] = &map[string]interface{}{"status": false, "info": "展示时间超过报名开始时间"}
+		c.ServeJSON()
+		return
+	}
+	if currTime > _SignupEndTime {
+		c.Data["json"] = &map[string]interface{}{"status": false, "info": "报名结束时间错误！已报名结束"}
+		c.ServeJSON()
+		return
+	}
+	if currTime > _AwardTime || _ShowStartTime > _AwardTime || _SignupEndTime > _AwardTime {
+		c.Data["json"] = &map[string]interface{}{"status": false, "info": "开奖时间错误！已开奖"}
+		c.ServeJSON()
+		return
+	}
 	// 奖励方案道具列表
 	u := new(models.RollInfo)
 	u.Id = models.CreateRollId()
 	u.Name = name
 	u.BandShareCode = bandShareCode
-	u.ShowStartTime = utils.GetTime64(showStartTime)
-	u.SignupStartTime = utils.GetTime64(signupStartTime)
-	u.SignupEndTime = utils.GetTime64(signupEndTime)
-	u.AwardTime = utils.GetTime64(awardTime)
+	u.ShowStartTime = _ShowStartTime
+	u.SignupStartTime = _SignupStartTime
+	u.SignupEndTime = _SignupEndTime
+	u.AwardTime = _AwardTime
 	u.Conditions = _conditions
 	u.ItemIdList = itemIdList
 
@@ -102,19 +136,25 @@ func (c *RollController) Put() {
 		c.ServeJSON()
 		return
 	}
+	currTime := time.Now().Unix()
+	if currTime >= hf.ShowStartTime {
+		c.Data["json"] = &map[string]interface{}{"status": false, "info": "已开始展示给玩家，请勿变动"}
+		c.ServeJSON()
+		return
+	}
 	name := c.GetString("name")
 	bandShareCode := c.GetString("bandShareCode")
 	showStartTime := c.GetString("showStartTime")
 	signupStartTime := c.GetString("signupStartTime")
 	signupEndTime := c.GetString("signupEndTime")
 	awardTime := c.GetString("awardTime")
-	conditions := c.GetString("conditions")
+	conditionList := c.GetString("conditionList")
 	awardId, _ := c.GetInt("awardId")
 
 	var _conditions []*models.RollConditionInfo
-	err := json.Unmarshal([]byte(conditions), &_conditions)
+	err := json.Unmarshal([]byte(conditionList), &_conditions)
 	if err != nil {
-		log.Printf("RollController Post conditions[%s] err[%v]", conditions, err)
+		log.Printf("RollController Post conditionList[%s] err[%v]", conditionList, err)
 		c.Data["json"] = &map[string]interface{}{"status": false, "info": err.Error()}
 		c.ServeJSON()
 		return
@@ -161,6 +201,12 @@ func (c *RollController) Delete() {
 		c.ServeJSON()
 		return
 	}
+	currTime := time.Now().Unix()
+	if currTime >= hf.ShowStartTime {
+		c.Data["json"] = &map[string]interface{}{"status": false, "info": "已开始展示给玩家，请勿变动"}
+		c.ServeJSON()
+		return
+	}
 
 	models.DelRollInfoById(id)
 

main.go

@@ -118,6 +118,11 @@ func BeegoItemNameList(items []int) string {
 	return cnt
 }
 
+// 玩家昵称
+func BeegoGetPlayerNickname(uid int) string {
+	return utils.GetPlayerNickname(uid)
+}
+
 // 初始化beego fun
 func initBeegoFunMap() {
 	beego.AddFuncMap("TimeToStr", TimeToStr)
@@ -129,6 +134,7 @@ func initBeegoFunMap() {
 	beego.AddFuncMap("TimeCmdOperateStatus", TimeCmdOperateStatus)
 	beego.AddFuncMap("WeightItems", WeightItems)
 	beego.AddFuncMap("BeegoItemNameList", BeegoItemNameList)
+	beego.AddFuncMap("BeegoGetPlayerNickname", BeegoGetPlayerNickname)
 }
 
 func main() {
@@ -159,6 +165,7 @@ func main() {
 	models.UpdateItemConfig()
 	models.UpdateGoodsConfig()
 	models.InitRollAwardInfo()
+	models.InitRollInfo()
 
 	//模板初始化
 	initBeegoFunMap()

models/roll.go

@@ -35,6 +35,15 @@ type RollInfo struct {
 
 type RollInfoArray []*RollInfo
 
+type RollCondition struct {
+	KeyCondition string
+	Name         string
+}
+
+type RollConditionArray []*RollCondition
+
+var conditionList RollConditionArray
+
 var rollList RollInfoArray
 var riMutex sync.Mutex
 var ROLL_MAIN_KEY = "roll:room"
@@ -82,8 +91,9 @@ func InitRollInfo() {
 
 	result, _ := redis.Values(rd.Do("smembers", ROLL_MAIN_KEY))
 	for _, v := range result {
-		id := utils.StringToInt(v.([]byte))
+		id := utils.StringToInt(string(v.([]byte)))
 		pKey := get_roll_key(id)
+		log.Printf("InitRollInfo v[%v] id[%d] pKey[%s]", v, id, pKey)
 		name, _ := redis.String(rd.Do("hget", pKey, "name"))
 		bandShareCode, _ := redis.String(rd.Do("hget", pKey, "bandShareCode"))
 		creatTime, _ := redis.Int64(rd.Do("hget", pKey, "creatTime"))
@@ -119,6 +129,10 @@ func InitRollInfo() {
 		})
 	}
 
+	conditionList = append(conditionList, &RollCondition{
+		KeyCondition: "pay_day_totalAmount",
+		Name:         "今日充值(单位:分)",
+	})
 	beego.Info("load roll info", len(rollList))
 }
 
@@ -164,9 +178,10 @@ func AddRollInfo(hf *RollInfo) error {
 
 	bConditions, _ := json.Marshal(hf.Conditions)
 	bItemIdList, _ := json.Marshal(hf.ItemIdList)
-	columns := "id,name,bandShareCode,creatTime,showStartTime,signupStartTime,signupEndTime,awardTime,conditions,itemIdList"
+	columns := "id,name,bandShareCode,createTime,showStartTime,signupStartTime,signupEndTime,awardTime,conditions,itemIdList"
 	values := fmt.Sprintf("%d, '%s', '%s', %d, %d, %d, %d,  %d, '%s', '%s'", hf.Id, hf.Name, hf.BandShareCode, hf.CreateTime, hf.ShowStartTime, hf.SignupStartTime, hf.SignupEndTime, hf.AwardTime, bConditions, bItemIdList)
 	sql := fmt.Sprintf("insert into mdl_roll (%s) value (%s);", columns, values)
+	log.Println("AddRollInfo sql:", sql)
 	_, err = db.Exec(sql)
 	if err != nil {
 		log.Println("AddRollInfo Insert data Exec Failed, Error: ", err)
@@ -176,13 +191,13 @@ func AddRollInfo(hf *RollInfo) error {
 	pKey := get_roll_key(hf.Id)
 	rd.Do("hset", pKey, "name", hf.Name)
 	rd.Do("hset", pKey, "bandShareCode", hf.BandShareCode)
-	rd.Do("hset", pKey, "creatTime", hf.CreateTime)
+	rd.Do("hset", pKey, "createTime", hf.CreateTime)
 	rd.Do("hset", pKey, "showStartTime", hf.ShowStartTime)
 	rd.Do("hset", pKey, "signupStartTime", hf.SignupStartTime)
 	rd.Do("hset", pKey, "signupEndTime", hf.SignupEndTime)
 	rd.Do("hset", pKey, "awardTime", hf.AwardTime)
-	rd.Do("hset", pKey, "conditions", hf.Conditions)
-	rd.Do("hset", pKey, "itemIdList", hf.ItemIdList)
+	rd.Do("hset", pKey, "conditions", bConditions)
+	rd.Do("hset", pKey, "itemIdList", bItemIdList)
 
 	rd.Do("sadd", ROLL_MAIN_KEY, hf.Id)
 
@@ -231,8 +246,8 @@ func UpdateRollInfo(hf *RollInfo) error {
 	rd.Do("hset", pKey, "signupStartTime", hf.SignupStartTime)
 	rd.Do("hset", pKey, "signupEndTime", hf.SignupEndTime)
 	rd.Do("hset", pKey, "awardTime", hf.AwardTime)
-	rd.Do("hset", pKey, "conditions", hf.Conditions)
-	rd.Do("hset", pKey, "itemIdList", hf.ItemIdList)
+	rd.Do("hset", pKey, "conditions", bConditions)
+	rd.Do("hset", pKey, "itemIdList", bItemIdList)
 
 	riMutex.Lock()
 	for i := 0; i < len(rollList); i++ {
@@ -269,7 +284,6 @@ func UpdateSignupUidList(id int) error {
 	var _signupUidList []int
 	json.Unmarshal([]byte(signupUidList), &_signupUidList)
 
-	riMutex.Lock()
 	for i := 0; i < len(rollList); i++ {
 		if id == rollList[i].Id {
 			old := rollList[i]
@@ -278,7 +292,6 @@ func UpdateSignupUidList(id int) error {
 			break
 		}
 	}
-	riMutex.Unlock()
 	return nil
 }
 
@@ -335,6 +348,18 @@ func GetRollInfoList() RollInfoArray {
 	for _, v := range rollList {
 		UpdateSignupUidList(v.Id)
 	}
+	// 已开奖
+	var _rollList RollInfoArray
+	currTime := time.Now().Unix()
+	for _, v := range rollList {
+		if v.AwardTime > currTime {
+			_rollList = append(_rollList, v)
+		}
+	}
+	rollList = _rollList
 
 	return rollList
 }
+func GetRollConditionList() RollConditionArray {
+	return conditionList
+}

routers/router.go

@@ -61,4 +61,5 @@ func init() {
 	beego.Router("/exchangecode", &controllers.ExchangeCodeController{})
 	beego.Router("/gameconfig", &controllers.GameConfigController{})
 	beego.Router("/rollaward", &controllers.RollAwardController{})
+	beego.Router("/roll", &controllers.RollController{})
 }

utils/redis.go

@@ -370,36 +370,25 @@ func UpdateVersionInfo(version int, data map[string]interface{}) bool {
 	return true
 }
 
-// 支付通道 - 获取
-func GetPixPayChannel() string {
-	pool := GetAccountRedisPool()
+// 获取玩家昵称
+func GetPlayerNickname(uid int) string {
+	pool := GetPlayerRedisPool(0)
 	if pool == nil {
 		fmt.Println("get redis pool fail")
 		return ""
 	}
-	rd := pool.Get()
-	defer rd.Close()
-
-	val, _ := redis.String(rd.Do("hget", "tb_global:1", "pixPayChannel"))
-	log.Println("GetPixPayChannel val:", val)
-
-	return val
-}
-
-// 支付通道 - 更新
-func UpdatePixPayChannel(chn string) bool {
-	pool := GetAccountRedisPool()
-	if pool == nil {
-		fmt.Println("get redis pool fail")
-		return false
+	redisConn := pool.Get()
+	if redisConn == nil {
+		fmt.Println("get redis conn fail")
+		return ""
 	}
-	rd := pool.Get()
-	defer rd.Close()
+	defer redisConn.Close()
 
-	_, err := rd.Do("hset", "tb_global:1", "pixPayChannel", []byte(chn))
+	key := fmt.Sprintf("mdl:user:%d", uid)
+	val, err := redis.String(redisConn.Do("hget", key, "nickname"))
 	if err != nil {
-		fmt.Println("UpdatePixPayChannel err:", err)
-		return false
+		fmt.Printf("redis hset err: %v", err)
+		return ""
 	}
-	return true
+	return val
 }

views/roll.tpl

@@ -9,72 +9,170 @@
         <script src="./static/lib/layui/layui.js" charset="utf-8"></script>
         <script type="text/javascript" src="./static/js/xadmin.js"></script>
     </head>
-    <body>
+    <body onload="InitParams({{.AwardList}}, {{.ConditionList}}, {{.ItemList}})">
     <input type="text" id="token" value={{.token}} hidden=true>
 
     <dialog open id="modalAdd" class="x-body layui-anim layui-anim-up" hidden=true style = "center;">
         <form action="roll" method="post" class="layui-form layui-form-pane">
-            物品列表
-            <table class="radio-table" border="1" id="tb_item">
+            房间名
+            <input id="name" name="name" placeholder="房间名"  type="text" lay-verify="required" class="layui-input">
+            <br>
+            限制绑定推广码
+            <input id="bandShareCode" name="bandShareCode" placeholder="限制绑定推广码"  type="text" lay-verify="required" class="layui-input">
+            <br>
+            开始展示时间
+            <input id="showStartTime" name="showStartTime" placeholder="开始展示时间"  type="text" lay-verify="required" class="layui-input">
+            <br>
+            报名开始时间
+            <input id="signupStartTime" name="signupStartTime" placeholder="报名开始时间"  type="text" lay-verify="required" class="layui-input">
+            <br>
+            报名结束时间
+            <input id="signupEndTime" name="signupEndTime" placeholder="兑报名结束时间换码"  type="text" lay-verify="required" class="layui-input">
+            <br>
+            开奖时间
+            <input id="awardTime" name="awardTime" placeholder="开奖时间"  type="text" lay-verify="required" class="layui-input">
+            <br>
+            奖励方案
+            <select id="award_id">
+              {{range .AwardList}}
+                <option value={{.Id}}>{{BeegoItemNameList .ItemIdList}}</option>
+              {{end}}
+            </select>
+            <hr class="hr15">
+            条件列表
+            <table class="radio-table" border="1" id="tb_condition_add">
               <thead>
-                <th style="width:100px;">物品</th>
-                <th style="width:100px;">价值</th>
-                <th style="width:256px;">操作</th>
+                <th style="width:256px;">条件类型</th>
+                <th style="width:100px;">需求值</th>
+                <th style="width:128px;">操作</th>
               </thead>
             </table>
             <br>
-            <input class="layui-btn" type="button" onclick="modalAddItem()" value=新增道具>
+            <input class="layui-btn" type="button" onclick="modalAddCondition()" value=新增条件>
             <hr class="hr15">
             <input value="新增" class="layui-btn" style="width:100%;" type="button" onclick="addRoll()">
             <br>
             <br>
             <input value="关闭" class="layui-btn" style="width:100%;" type="button" onclick="closeModalAdd()">
-            <hr class="hr20" >
+            <hr class="hr20">
         </form>
     </dialog>
 
     <dialog open id="modalModify" class="x-body layui-anim layui-anim-up" hidden=true style = "center;">
         <form action="roll" method="put" class="layui-form layui-form-pane">
             <input id="id_modify" hidden=true type="text">
-            随机物品列表
-            <table class="radio-table" border="1" id="tb_item_modify">
+            房间名
+            <input id="name_modify" name="name" placeholder="房间名"  type="text" lay-verify="required" class="layui-input">
+            <br>
+            限制绑定推广码
+            <input id="bandShareCode_modify" name="bandShareCode" placeholder="限制绑定推广码"  type="text" lay-verify="required" class="layui-input">
+            <br>
+            开始展示时间
+            <input id="showStartTime_modify" name="showStartTime" placeholder="开始展示时间"  type="text" lay-verify="required" class="layui-input">
+            <br>
+            报名开始时间
+            <input id="signupStartTime_modify" name="signupStartTime" placeholder="报名开始时间"  type="text" lay-verify="required" class="layui-input">
+            <br>
+            报名结束时间
+            <input id="signupEndTime_modify" name="signupEndTime" placeholder="兑报名结束时间换码"  type="text" lay-verify="required" class="layui-input">
+            <br>
+            开奖时间
+            <input id="awardTime_modify" name="awardTime" placeholder="开奖时间"  type="text" lay-verify="required" class="layui-input">
+            <br>
+            奖励方案
+            <select id="award_id_modify">
+              {{range .AwardList}}
+                <option value={{.Id}}>{{BeegoItemNameList .ItemIdList}}</option>
+              {{end}}
+            </select>
+            <hr class="hr15">
+            条件列表
+            <table class="radio-table" border="1" id="tb_condition_modify">
               <thead>
-                <th style="width:100px;">物品ID</th>
-                <th style="width:100px;">物品数量</th>
-                <th style="width:100px;">权重</th>
-                <th style="width:256px;">操作</th>
+                <th style="width:256px;">条件类型</th>
+                <th style="width:100px;">需求值</th>
+                <th style="width:128px;">操作</th>
               </thead>
             </table>
             <br>
-            <input class="layui-btn" type="button" onclick="modalAddItem()" value=新增道具>
+            <input class="layui-btn" type="button" onclick="modalAddCondition()" value=新增条件>
             <hr class="hr15">
-            <input value="修改" class="layui-btn" style="width:100%;" type="button" onclick="modifyExchangeCode()">
+            <input value="修改" class="layui-btn" style="width:100%;" type="button" onclick="modifyRoll()">
             <br>
             <br>
             <input value="关闭" class="layui-btn" style="width:100%;" type="button" onclick="closeModalModify()">
-            <hr class="hr20" >
+            <hr class="hr20">
         </form>
     </dialog>
-    <dialog open id="modalItem" class="x-body layui-anim layui-anim-up" hidden=true style = "center;">
+    <dialog open id="modalModifyCondition" class="x-body layui-anim layui-anim-up" hidden=true style = "center;">
         <form class="layui-form layui-form-pane">
-            <select name="" id="item_id" onchange="gradeItemChange(this.options[this.options.selectedIndex].value)">
-              {{range .ItemList}}
-                <option value={{.Id}}>{{.Name}}</option>
+            条件类型
+            <select id="condition">
+              {{range .ConditionList}}
+                <option value={{.KeyCondition}}>{{.Name}}</option>
               {{end}}
             </select>
+            <br>
+            需求值
+            <input id="conditionValue" name="conditionValue" placeholder="需求值"  type="text" lay-verify="required" class="layui-input">
             <hr class="hr15">
-            <input id="btn" value="新增" class="layui-btn" style="width:100%;" type="button" onclick="addItem()">
+            <input id="btn" value="新增" class="layui-btn" style="width:100%;" type="button" onclick="addCondition()">
             <br>
             <br>
-            <input value="关闭" class="layui-btn" style="width:100%;" type="button" onclick="closeModalItem()">
+            <input value="关闭" class="layui-btn" style="width:100%;" type="button" onclick="closeModalCondtion()">
             <hr class="hr20" >
         </form>
     </dialog>
+    
+    <dialog open id="modalCondition" class="x-body layui-anim layui-anim-up" hidden=true style = "center;">
+        <form action="roll" method="put" class="layui-form layui-form-pane">
+            条件列表
+            <table class="radio-table" border="1" id="tb_condition">
+              <thead>
+                <th style="width:256px;">需求类型</th>
+                <th style="width:100px;">需求值</th>
+              </thead>
+            </table>
+            <hr class="hr15">
+            <input value="关闭" class="layui-btn" style="width:100%;" type="button" onclick="closeModalCondition()">
+            <hr class="hr20" >
+        </form>
+    </dialog>
+    <dialog open id="modalItems" class="x-body layui-anim layui-anim-up" hidden=true style = "center;">
+        <form action="roll" method="put" class="layui-form layui-form-pane">
+            总价值
+            <input id="totalPrice" type="text" lay-verify="required" class="layui-input", disabled="disabled">
+            <br>
+            奖励道具列表
+            <table class="radio-table" border="1" id="tb_items">
+              <thead>
+                <th style="width:256px;">道具名称</th>
+                <th style="width:100px;">价值</th>
+              </thead>
+            </table>
+            <hr class="hr15">
+            <input value="关闭" class="layui-btn" style="width:100%;" type="button" onclick="closeModalItems()">
+            <hr class="hr20" >
+        </form>
+    </dialog>
+    <dialog open id="modalPlayer" class="x-body layui-anim layui-anim-up" hidden=true style = "center;">
+        <form action="roll" method="put" class="layui-form layui-form-pane">
+            参与玩家列表
+            <table class="radio-table" border="1" id="tb_players">
+              <thead>
+                <th style="width:100px;">玩家ID</th>
+              </thead>
+            </table>
+            <hr class="hr15">
+            <input value="关闭" class="layui-btn" style="width:100%;" type="button" onclick="closeModalPlayer()">
+            <hr class="hr20" >
+        </form>
+    </dialog>
+
     <br>
     <br>
-    <input class="layui-btn" type="button" onclick="OpenAddItem({{.ItemList}})" value=新增>
-    <br>
-    <br>
+    <input class="layui-btn" type="button" onclick="OpenAddItem()" value=新增>
+    {{"    "}}
     <input class="layui-btn" type="button" onclick="Refresh()" value=刷新>
     <br>
     <br>
@@ -97,7 +195,7 @@
         {{range .infoList}}
           <tr>
             <td style = "text-align:center;">
-              <input class="layui-btn" type="button" onclick="OpenModifyItem({{.Id}}, {{.ItemIdList}}, {.ItemList})" value=修改>
+              <input class="layui-btn" type="button" onclick="OpenModifyItem({{.Id}}, {{.Name}}, {{.BandShareCode}}, {{TimeToStr .ShowStartTime}}, {{TimeToStr .SignupStartTime}}, {{TimeToStr .SignupEndTime}}, {{TimeToStr .AwardTime}}, {{.Conditions}}, {{.ItemIdList}})" value=修改>
               {{"   | "}}
               <input class="layui-btn" type="button" onclick="clickDelete({{.Id}})" value=删除>
             </td>
@@ -125,13 +223,60 @@
     <script language="JavaScript">
       var isModelAdd = true
       var _ItemList = [];
-      var awardItemIdList = [];
+      var _ConditionList = [];
+
+      function InitParams(awardList, conditionList, itemList) {
+        console.log("InitParams");
+        _ConditionList = conditionList;
+        _ItemList = itemList;
+      }
+      
+      function Refresh() {
+        var token = document.getElementById("token").value;
+        var text = "token=" + encodeURI(token);
+        text += "&action=update";
+        
+        $.ajax({
+          type:"get",
+          url:"/roll?" + text,
+          success:function (data) {
+            // alert(data.status);
+            if (data.status){
+              window.location.href="/roll";
+            }else{
+              if (data.info){
+                alert(data.info);
+              }else{
+                window.location.href="/accountlogin";
+              }
+            }
+          }
+        });
+      }
+      
+      function formaData(timer) {
+          const year = timer.getFullYear()
+          const month = (timer.getMonth() + 1).toString().padStart(2, '0') // 由于月份从0开始，因此需加1
+          const day = timer.getDate().toString().padStart(2, '0')
+          const hour = timer.getHours().toString().padStart(2, '0')
+          const minute = timer.getMinutes().toString().padStart(2, '0')
+          const second = timer.getSeconds().toString().padStart(2, '0')
+          return `${(year)}-${(month)}-${(day)} ${(hour)}:${(minute)}:${(second)}`
+      }
+
+      function getConditionName(key) {
+        for (var i = 0; i < _ConditionList.length; i ++){
+          if (_ConditionList[i].KeyCondition == key){
+            return _ConditionList[i].Name
+          }
+        }
+        return ""
+      }
+      
       // 道具名称
       function getItemName(itemId) {
         var id = parseInt(itemId)
-        console.info("getItemName id:"+id)
         for (var i = 0; i < _ItemList.length; i ++){
-          console.info("getItemName Id:"+_ItemList[i].id)
           if (_ItemList[i].id == id){
             return _ItemList[i].name
           }
@@ -141,8 +286,6 @@
       // 道具价格
       function getItemPrice(itemId) {
         var id = parseInt(itemId)
-        console.info("getItemPrice id:"+id)
-        console.info("getItemPrice _ItemList:"+JSON.stringify(_ItemList))
         for (var i = 0; i < _ItemList.length; i ++){
           if (_ItemList[i].id == id){
             return _ItemList[i].price
@@ -150,11 +293,45 @@
         }
         return ""
       }
-      // 刷新物品列表
-      function refreshTableItem() {
-        var key = "tb_item"
-        if (isModelAdd == false){key = "tb_item_modify"}
-        var obj = document.getElementById(key)
+      // 展示条件列表
+      function ShowConditions(conditions) {
+        var obj = document.getElementById("tb_condition")
+        var tbody = obj.getElementsByTagName("tbody")[0];
+        if (tbody) {
+          if (-[1,]) {
+            obj.removeChild(tbody);
+          }else{
+            obj.removeNode(tbody);
+          }
+        }
+
+        if (conditions.length > 0 && conditions[0] != "") {
+          tbody = document.createElement("tbody")
+          for (var i = 0; i < conditions.length; i++){
+            var tr = document.createElement("tr")
+
+            var td1 = document.createElement("td")
+            td1.style = "text-align:center;"
+            td1.innerHTML = getConditionName(conditions[i].c)
+            tr.appendChild(td1)
+
+            var td2 = document.createElement("td")
+            td2.style = "text-align:center;"
+            td2.innerHTML = conditions[i].cv
+            tr.appendChild(td2)
+
+            tbody.appendChild(tr)
+          }
+          obj.appendChild(tbody)
+        }
+        document.getElementById("modalCondition").hidden = false;
+      }
+      function closeModalCondition() {
+        document.getElementById("modalCondition").hidden = true;
+      }
+      // 展示奖励列表
+      function ShowItems(itemIdList) {
+        var obj = document.getElementById("tb_items")
         var tbody = obj.getElementsByTagName("tbody")[0];
         if (tbody) {
           if (-[1,]) {
@@ -163,28 +340,102 @@
             obj.removeNode(tbody);
           }
         }
-        for (var i = 0; i < awardItemIdList.length; i ++){
-          console.info("refreshTableItem awardItemId:"+awardItemIdList[i])
+
+        var totalPrice = 0;
+        if (itemIdList.length > 0 && itemIdList[0] != "") {
+          tbody = document.createElement("tbody")
+          for (var i = 0; i < itemIdList.length; i++){
+            var tr = document.createElement("tr");
+
+            var td1 = document.createElement("td");
+            td1.style = "text-align:center;";
+            td1.innerHTML = getItemName(itemIdList[i]);
+            tr.appendChild(td1);
+
+            var price = getItemPrice(itemIdList[i]);
+            totalPrice += price;
+            var td2 = document.createElement("td")
+            td2.style = "text-align:center;"
+            td2.innerHTML = price+"分"
+            tr.appendChild(td2)
+
+            tbody.appendChild(tr)
+          }
+          obj.appendChild(tbody)
+        }
+        document.getElementById("totalPrice").value = totalPrice+"分";
+
+        document.getElementById("modalItems").hidden = false;
+      }
+      function closeModalItems() {
+        document.getElementById("modalItems").hidden = true;
+      }
+      // 展示玩家列表
+      function ShowPlayers(signupUidList) {
+        var obj = document.getElementById("tb_players")
+        var tbody = obj.getElementsByTagName("tbody")[0];
+        if (tbody) {
+          if (-[1,]) {
+            obj.removeChild(tbody);
+          }else{
+            obj.removeNode(tbody);
+          }
         }
 
-        if (awardItemIdList.length > 0 && awardItemIdList[0] != "") {
+        if (signupUidList != null && signupUidList.length > 0 && signupUidList[0] != "") {
           tbody = document.createElement("tbody")
-          for (var i = 0; i < awardItemIdList.length; i++){
+          for (var i = 0; i < signupUidList.length; i++){
+            var tr = document.createElement("tr");
+
+            var td1 = document.createElement("td");
+            td1.style = "text-align:center;";
+            td1.innerHTML = signupUidList[i];
+            tr.appendChild(td1);
+
+            tbody.appendChild(tr)
+          }
+          obj.appendChild(tbody)
+        }
+        document.getElementById("modalPlayer").hidden = false;
+      }
+      function closeModalPlayer() {
+        document.getElementById("modalPlayer").hidden = true;
+      }
+
+      // 刷新条件列表
+      var conList = [];
+      function refreshTableCondition() {
+        var key = "tb_condition_add"
+        if (isModelAdd == false){key = "tb_condition_modify"}
+        var obj = document.getElementById(key)
+        var tbody = obj.getElementsByTagName("tbody")[0];
+        if (tbody) {
+          if (-[1,]) {
+            obj.removeChild(tbody);
+          }else{
+            obj.removeNode(tbody);
+          }
+        }
+
+        if (conList.length > 0 && conList[0] != "") {
+          tbody = document.createElement("tbody")
+          for (var i = 0; i < conList.length; i++){
             var tr = document.createElement("tr")
 
             var td1 = document.createElement("td")
             td1.style = "text-align:center;"
-            td1.innerHTML = getItemName(awardItemIdList[i])
+            td1.innerHTML = getConditionName(conList[i].c)
             tr.appendChild(td1)
 
             var td2 = document.createElement("td")
             td2.style = "text-align:center;"
-            td2.innerHTML = getItemPrice(awardItemIdList[i])
+            td2.innerHTML = conList[i].cv
             tr.appendChild(td2)
 
+            console.info("refreshTableCondition :"+conList[i].c)
             var td4 = document.createElement("td")
             td4.style = "text-align:center;"
-            td4.innerHTML = '<input class="layui-btn" type="button" onclick="itemDelete(' + awardItemIdList[i] + ')" value=删除>'
+            td4.innerHTML = '<input class="layui-btn" type="button" onclick="conditionDelete(' + i + ')" value=删除>'
             tr.appendChild(td4)
 
             tbody.appendChild(tr)
@@ -193,45 +444,67 @@
         }
       }
       // 物品弹窗
-      function modalAddItem() {
-        refreshTableItem()
+      function modalAddCondition() {
+        refreshTableCondition()
 
-        document.getElementById("modalItem").hidden = false;
+        document.getElementById("modalModifyCondition").hidden = false;
       }
-      function closeModalItem() {
-        document.getElementById("modalItem").hidden = true;
+      function closeModalCondtion() {
+        document.getElementById("modalModifyCondition").hidden = true;
       }
-      function addItem() {
-        var item_id = parseInt(document.getElementById("item_id").value);
+      function addCondition() {
+        var condition = document.getElementById("condition").value;
+        var conditionValue = document.getElementById("conditionValue").value;
+        console.log("addCondition conditionValue:" + conditionValue)
 
-        if (item_id == null || item_id == 0){
-          alert("请选择道具");
+        if (condition == null || condition == ""){
+          alert("请选择条件类型");
           return;
         }
-
-        awardItemIdList.push(item_id)
-        refreshTableItem()
-        document.getElementById("modalItem").hidden = true;
-      }
-      // 删除物品
-      function itemDelete(itemId) {
-        var id = parseInt(itemId)
-        console.log("itemDelete itemId:" + itemId)
-        for (var i = 0; i < awardItemIdList.length; i ++) {
-          if (awardItemIdList[i] == id) {
-            console.log("itemDelete 找到道具")
-            awardItemIdList.splice(i, 1)
-            break
+        if (conditionValue == NaN || conditionValue == ""){
+          alert("请输入需求值");
+          return;
+        }
+        var _val = parseInt(conditionValue)
+        if (_val <= 0) {
+          alert("请输入正确需求值");
+          return;
+        }
+        if (conList.length > 0){
+          for (var i = 0; i < conList.length; i ++){
+            if (conList[i].c == condition) {
+              alert("已存在该条件类型！请重新选择");
+              return;
+            }
           }
         }
-        refreshTableItem()
-        document.getElementById("modalItem").hidden = true;
+        conList.push({'c':condition, 'cv':_val})
+        refreshTableCondition()
+        document.getElementById("modalModifyCondition").hidden = true;
+      }
+      // 删除物品
+      function conditionDelete(index) {
+        console.log("conditionDelete index:" + index)
+        conList.splice(index, 1);
+        refreshTableCondition()
+        document.getElementById("modalModifyCondition").hidden = true;
       }
 
-      function OpenAddItem(itemList) {
+      function OpenAddItem() {
         isModelAdd = true
-        _ItemList = itemList
-        console.log("OpenAddItem _ItemList:"+JSON.stringify(_ItemList))
+        conList = []
+        
+        var dateTime = new Date();
+        document.getElementById("showStartTime").value = formaData(dateTime);
+        dateTime = dateTime.setDate(dateTime.getDate()+7);
+        dateTime = new Date(dateTime);
+        document.getElementById("signupStartTime").value = formaData(dateTime);
+        dateTime = dateTime.setDate(dateTime.getDate()+30);
+        dateTime = new Date(dateTime);
+        document.getElementById("signupEndTime").value = formaData(dateTime);
+        dateTime = dateTime.setDate(dateTime.getDate()+1);
+        dateTime = new Date(dateTime);
+        document.getElementById("awardTime").value = formaData(dateTime);
 
         document.getElementById("modalAdd").hidden = false;
       }
@@ -240,13 +513,52 @@
       }
       function addRoll () {
         var token = document.getElementById("token").value;
-        if (awardItemIdList.length <= 0){
-          alert("奖励物品空！");
+        var name = document.getElementById("name").value;
+        var bandShareCode = document.getElementById("bandShareCode").value;
+        var showStartTime = document.getElementById("showStartTime").value;
+        var signupStartTime = document.getElementById("signupStartTime").value;
+        var signupEndTime = document.getElementById("signupEndTime").value;
+        var awardTime = document.getElementById("awardTime").value;
+        var award_id = document.getElementById("award_id").value;
+
+        if (name == ""){
+          alert("请设置房间名");
+          return;
+        }
+        if (showStartTime == ""){
+          alert("请设置开始展示时间");
+          return;
+        }
+        if (signupStartTime == ""){
+          alert("请设置报名开始时间");
+          return;
+        }
+        if (signupEndTime == ""){
+          alert("请设置报名结束时间");
+          return;
+        }
+        if (awardTime == ""){
+          alert("请设置开奖时间");
+          return;
+        }
+        if (award_id == ""){
+          alert("请设置奖励方案");
+          return;
+        }
+        if (conList.length <= 0){
+          alert("请设置参与条件");
           return;
         }
 
         var text = "token=" + encodeURI(token);
-        text += "&items=" + encodeURI(JSON.stringify(awardItemIdList));
+        text += "&name=" + encodeURI(name);
+        text += "&bandShareCode=" + encodeURI(bandShareCode);
+        text += "&showStartTime=" + encodeURI(showStartTime);
+        text += "&signupStartTime=" + encodeURI(signupStartTime);
+        text += "&signupEndTime=" + encodeURI(signupEndTime);
+        text += "&awardTime=" + encodeURI(awardTime);
+        text += "&awardId=" + encodeURI(award_id);
+        text += "&conditionList=" + encodeURI(JSON.stringify(conList));
 
         $.ajax({
           type:"post",
@@ -266,24 +578,26 @@
         });
       }
 
-      function closeModalItem() {
-        document.getElementById("modalItem").hidden = true;
-      }
 
-      function OpenModifyItem(id, itemIdList, itemList) {
+      function OpenModifyItem(id, name, bandShareCode, showStartTime, signupStartTime, signupEndTime, awardTime, conditions, itemIdList) {
         isModelAdd = false;
-        _ItemList = itemList
 
-        awardItemIdList = []
-        for (var i = 0; i < items.length; i ++) {
-          awardItemIdList.push({'id':items[i].id, 'count':items[i].count, 'weight':items[i].weight});
-        }
+        document.getElementById("id_modify").value = id;
+        document.getElementById("name_modify").value = name;
+        document.getElementById("bandShareCode_modify").value = bandShareCode;
+        document.getElementById("showStartTime_modify").value = showStartTime;
+        document.getElementById("signupStartTime_modify").value = signupStartTime;
+        document.getElementById("signupEndTime_modify").value = signupEndTime;
+        document.getElementById("awardTime_modify").value = awardTime;
 
-        document.getElementById("pcode_modify").value = pcode;
-        document.getElementById("awardTimes_modify").value = awardTimes;
-        var dateTime = new Date(expireTime*1000);
-        document.getElementById("expireTime_modify").value = formaData(dateTime);
-        refreshTableItem()
+        conList = []
+        if (conditions != null && conditions.length > 0) {
+          for (var i = 0; i < conditions.length; i ++) {
+            conList.push({'c':conditions[i].c, 'cv':conditions[i].cv})
+          }
+        }
+        
+        refreshTableCondition()
 
         document.getElementById("modalModify").hidden = false;
       }
@@ -291,17 +605,56 @@
         document.getElementById("modalModify").hidden = true;
       }
 
-      function modifyExchangeCode () {
+      function modifyRoll () {
         var token = document.getElementById("token").value;
-        var pcode = document.getElementById("pcode_modify").value;
-        var awardTimes = document.getElementById("awardTimes_modify").value;
-        var expireTime = document.getElementById("expireTime_modify").value;
+        var id = document.getElementById("id_modify").value;
+        var name = document.getElementById("name_modify").value;
+        var bandShareCode = document.getElementById("bandShareCode_modify").value;
+        var showStartTime = document.getElementById("showStartTime_modify").value;
+        var signupStartTime = document.getElementById("signupStartTime_modify").value;
+        var signupEndTime = document.getElementById("signupEndTime_modify").value;
+        var awardTime = document.getElementById("awardTime_modify").value;
+        var awardId = document.getElementById("award_id_modify").value;
+
+        if (name == ""){
+          alert("请设置房间名");
+          return;
+        }
+        if (showStartTime == ""){
+          alert("请设置开始展示时间");
+          return;
+        }
+        if (signupStartTime == ""){
+          alert("请设置报名开始时间");
+          return;
+        }
+        if (signupEndTime == ""){
+          alert("请设置报名结束时间");
+          return;
+        }
+        if (awardTime == ""){
+          alert("请设置开奖时间");
+          return;
+        }
+        if (awardId == ""){
+          alert("请设置奖励方案");
+          return;
+        }
+        if (conList.length <= 0){
+          alert("请设置参与条件");
+          return;
+        }
 
         var text = "token=" + encodeURI(token);
-        text += "&pcode=" + encodeURI(pcode);
-        text += "&awardTimes=" + encodeURI(awardTimes);
-        text += "&expireTime=" + encodeURI(expireTime);
-        text += "&items=" + encodeURI(JSON.stringify(awardItemIdList));
+        text += "&id=" + encodeURI(id);
+        text += "&name=" + encodeURI(name);
+        text += "&bandShareCode=" + encodeURI(bandShareCode);
+        text += "&showStartTime=" + encodeURI(showStartTime);
+        text += "&signupStartTime=" + encodeURI(signupStartTime);
+        text += "&signupEndTime=" + encodeURI(signupEndTime);
+        text += "&awardTime=" + encodeURI(awardTime);
+        text += "&awardId=" + encodeURI(awardId);
+        text += "&conditionList=" + encodeURI(JSON.stringify(conList));
 
         $.ajax({
           type:"put",
@@ -321,10 +674,11 @@
         });
       }
 
-      function clickDelete (pcode) {
+      function clickDelete (id) {
         var token = document.getElementById("token").value;
+
         var text = "token=" + encodeURI(token);
-        text += "&pcode=" + encodeURI(pcode);
+        text += "&id=" + encodeURI(id);
 
         $.ajax({
           type:"delete",

views/rollaward.tpl

@@ -9,7 +9,7 @@
         <script src="./static/lib/layui/layui.js" charset="utf-8"></script>
         <script type="text/javascript" src="./static/js/xadmin.js"></script>
     </head>
-    <body>
+    <body onload="InitParams({{.ItemList}})">
     <input type="text" id="token" value={{.token}} hidden=true>
 
     <dialog open id="modalAdd" class="x-body layui-anim layui-anim-up" hidden=true style = "center;">
@@ -39,16 +39,15 @@
             随机物品列表
             <table class="radio-table" border="1" id="tb_item_modify">
               <thead>
-                <th style="width:100px;">物品ID</th>
-                <th style="width:100px;">物品数量</th>
-                <th style="width:100px;">权重</th>
+                <th style="width:100px;">物品</th>
+                <th style="width:100px;">价值</th>
                 <th style="width:256px;">操作</th>
               </thead>
             </table>
             <br>
             <input class="layui-btn" type="button" onclick="modalAddItem()" value=新增道具>
             <hr class="hr15">
-            <input value="修改" class="layui-btn" style="width:100%;" type="button" onclick="modifyExchangeCode()">
+            <input value="修改" class="layui-btn" style="width:100%;" type="button" onclick="modifyRollAward()">
             <br>
             <br>
             <input value="关闭" class="layui-btn" style="width:100%;" type="button" onclick="closeModalModify()">
@@ -72,7 +71,7 @@
     </dialog>
     <br>
     <br>
-    <input class="layui-btn" type="button" onclick="OpenAddItem({{.ItemList}})" value=新增>
+    <input class="layui-btn" type="button" onclick="OpenAddItem()" value=新增>
     <br>
     <br>
     <input class="layui-btn" type="button" onclick="Refresh()" value=刷新>
@@ -88,7 +87,7 @@
         {{range .infoList}}
           <tr>
             <td style = "text-align:center;">
-              <input class="layui-btn" type="button" onclick="OpenModifyItem({{.Id}}, {{.ItemIdList}}, {.ItemList})" value=修改>
+              <input class="layui-btn" type="button" onclick="OpenModifyItem({{.Id}}, {{.ItemIdList}})" value=修改>
               {{"   | "}}
               <input class="layui-btn" type="button" onclick="clickDelete({{.Id}})" value=删除>
             </td>
@@ -102,12 +101,15 @@
       var isModelAdd = true
       var _ItemList = [];
       var awardItemIdList = [];
+      
+      function InitParams( itemList) {
+        console.log("InitParams");
+        _ItemList = itemList;
+      }
       // 道具名称
       function getItemName(itemId) {
         var id = parseInt(itemId)
-        console.info("getItemName id:"+id)
         for (var i = 0; i < _ItemList.length; i ++){
-          console.info("getItemName Id:"+_ItemList[i].id)
           if (_ItemList[i].id == id){
             return _ItemList[i].name
           }
@@ -117,8 +119,6 @@
       // 道具价格
       function getItemPrice(itemId) {
         var id = parseInt(itemId)
-        console.info("getItemPrice id:"+id)
-        console.info("getItemPrice _ItemList:"+JSON.stringify(_ItemList))
         for (var i = 0; i < _ItemList.length; i ++){
           if (_ItemList[i].id == id){
             return _ItemList[i].price
@@ -204,10 +204,8 @@
         document.getElementById("modalItem").hidden = true;
       }
 
-      function OpenAddItem(itemList) {
+      function OpenAddItem() {
         isModelAdd = true
-        _ItemList = itemList
-        console.log("OpenAddItem _ItemList:"+JSON.stringify(_ItemList))
 
         document.getElementById("modalAdd").hidden = false;
       }
@@ -246,19 +244,15 @@
         document.getElementById("modalItem").hidden = true;
       }
 
-      function OpenModifyItem(id, itemIdList, itemList) {
+      function OpenModifyItem(id, itemIdList) {
         isModelAdd = false;
-        _ItemList = itemList
 
         awardItemIdList = []
-        for (var i = 0; i < items.length; i ++) {
-          awardItemIdList.push({'id':items[i].id, 'count':items[i].count, 'weight':items[i].weight});
+        for (var i = 0; i < itemIdList.length; i ++) {
+          awardItemIdList.push(itemIdList[i]);
         }
 
-        document.getElementById("pcode_modify").value = pcode;
-        document.getElementById("awardTimes_modify").value = awardTimes;
-        var dateTime = new Date(expireTime*1000);
-        document.getElementById("expireTime_modify").value = formaData(dateTime);
+        document.getElementById("id_modify").value = id;
         refreshTableItem()
 
         document.getElementById("modalModify").hidden = false;
@@ -267,16 +261,16 @@
         document.getElementById("modalModify").hidden = true;
       }
 
-      function modifyExchangeCode () {
+      function modifyRollAward () {
         var token = document.getElementById("token").value;
-        var pcode = document.getElementById("pcode_modify").value;
-        var awardTimes = document.getElementById("awardTimes_modify").value;
-        var expireTime = document.getElementById("expireTime_modify").value;
+        var id = document.getElementById("id_modify").value;
+        if (awardItemIdList.length <= 0){
+          alert("奖励物品空！");
+          return;
+        }
 
         var text = "token=" + encodeURI(token);
-        text += "&pcode=" + encodeURI(pcode);
-        text += "&awardTimes=" + encodeURI(awardTimes);
-        text += "&expireTime=" + encodeURI(expireTime);
+        text += "&id=" + encodeURI(id);
         text += "&items=" + encodeURI(JSON.stringify(awardItemIdList));
 
         $.ajax({