修改兑换码信息

controllers/exchangecode.go

@@ -5,6 +5,7 @@ import (
 	"box-gm/models"
 	"box-gm/utils"
 	"encoding/json"
+	"fmt"
 	"log"
 
 	"github.com/astaxie/beego"
@@ -51,11 +52,6 @@ func (c *ExchangeCodeController) Post() {
 	awardTimes, _ := c.GetInt64("awardTimes")
 	expireTime := c.GetString("expireTime")
 	items := c.GetString("items")
-
-	u := new(models.ExchangeCodeInfo)
-	u.Pcode = pcode
-	u.AwardTimes = awardTimes
-	u.ExpireTime = utils.GetTime64(expireTime)
 	var eItems []*models.ExchangeItemsInfo
 	err := json.Unmarshal([]byte(items), &eItems)
 	if err != nil {
@@ -64,6 +60,11 @@ func (c *ExchangeCodeController) Post() {
 		c.ServeJSON()
 		return
 	}
+
+	u := new(models.ExchangeCodeInfo)
+	u.Pcode = pcode
+	u.AwardTimes = awardTimes
+	u.ExpireTime = utils.GetTime64(expireTime)
 	u.Items = eItems
 
 	err = models.AddExchangeCodeInfo(u)
@@ -83,21 +84,37 @@ func (c *ExchangeCodeController) Put() {
 		c.Ctx.Redirect(302, "/accountlogin")
 		return
 	}
+	pcode := c.GetString("pcode")
+	log.Printf("ExchangeCodeController Post pcode[%s]", pcode)
+	hf := models.GetExchangeCodeInfoByCode(pcode)
+	if hf == nil {
+		c.Data["json"] = &map[string]interface{}{"status": false, "info": "修改失败:兑换码配置不存在"}
+		c.ServeJSON()
+		return
+	}
+	awardTimes, _ := c.GetInt64("awardTimes")
+	expireTime := c.GetString("expireTime")
+	items := c.GetString("items")
+	var eItems []*models.ExchangeItemsInfo
+	err := json.Unmarshal([]byte(items), &eItems)
+	if err != nil {
+		log.Printf("ExchangeCodeController items[%s] err[%v]", items, err)
+		c.Data["json"] = &map[string]interface{}{"status": false, "info": err.Error()}
+		c.ServeJSON()
+		return
+	}
 
-	u := new(models.HotfixInfo)
-	u.Id, _ = c.GetInt64("id")
-	u.Channel, _ = c.GetInt64("channel")
-	u.Version = c.GetString("version")
-	u.DowloadAddr = c.GetString("addr")
-	u.FileSize = c.GetString("filesize")
+	hf.AwardTimes = awardTimes
+	hf.ExpireTime = utils.GetTime64(expireTime)
+	hf.Items = eItems
 
-	_, err := models.UpdateHotfixInfo(u)
+	err = models.UpdateExchangeCodeInfo(hf)
 	if err != nil {
 		c.Data["json"] = &map[string]interface{}{"status": false, "info": err}
 		c.ServeJSON()
 		return
 	}
-	c.Data["json"] = &map[string]interface{}{"status": true, "info": "更新热更新参数成功"}
+	c.Data["json"] = &map[string]interface{}{"status": true, "info": fmt.Sprintf("修改兑换码[%s]成功", pcode)}
 	c.ServeJSON()
 }
 
@@ -108,16 +125,17 @@ func (c *ExchangeCodeController) Delete() {
 		return
 	}
 
-	id, _ := c.GetInt64("id")
-	cp := models.GetHotfixInfoById(id)
-	if cp == nil {
-		c.Data["json"] = &map[string]interface{}{"status": false, "info": "参数不存在"}
+	pcode := c.GetString("pcode")
+	log.Printf("ExchangeCodeController Post Delete[%s]", pcode)
+	hf := models.GetExchangeCodeInfoByCode(pcode)
+	if hf == nil {
+		c.Data["json"] = &map[string]interface{}{"status": false, "info": "修改失败:兑换码配置不存在"}
 		c.ServeJSON()
 		return
 	}
 
-	models.DelHotfixInfoById(id)
+	models.DelExchangeCodeInfoById(pcode)
 
-	c.Data["json"] = &map[string]interface{}{"status": true, "info": "删除热更新参成功"}
+	c.Data["json"] = &map[string]interface{}{"status": true, "info": "删除兑换码成功"}
 	c.ServeJSON()
 }

views/exchangecode.tpl

@@ -14,7 +14,8 @@
 
     <dialog open id="modalAdd" class="x-body layui-anim layui-anim-up" hidden=true style = "center;">
         <form action="exchangecode" method="post" class="layui-form layui-form-pane">
-            <input id="pcode" name="pcode" placeholder="兑换码"  type="text" lay-verify="required" class="layui-input" disabled="disabled">
+            兑换码
+            <input id="pcode" name="pcode" placeholder="兑换码"  type="text" lay-verify="required" class="layui-input">
             <br>
             <input class="layui-btn" type="button" onclick="randCode()" value=随机>
             <hr class="hr15">
@@ -49,13 +50,23 @@
     <dialog open id="modalModify" class="x-body layui-anim layui-anim-up" hidden=true style = "center;">
         <form action="exchangecode" method="put" class="layui-form layui-form-pane">
             <input id="pcode_modify" hidden=true type="text">
-            <input id="awardTimes_modify" name="awardTimes_modify" placeholder="渠道"  type="text" lay-verify="required" class="layui-input">
+            剩余领奖次数
+            <input id="awardTimes_modify" name="awardTimes_modify" placeholder="剩余领奖次数"  type="text" lay-verify="required" class="layui-input">
             <br>
-            <input id="expireTime_modify" name="expireTime_modify" placeholder="版本"  type="text" lay-verify="required" class="layui-input">
-            <br>
-            <input id="items_modify" name="items_modify" placeholder="下载地址"  type="text" lay-verify="required" class="layui-input">
+            过期时间
+            <input id="expireTime_modify" name="expireTime_modify" placeholder="过期时间"  type="text" lay-verify="required" class="layui-input">
+            <hr class="hr15">
+            随机物品列表
+            <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:256px;">操作</th>
+              </thead>
+            </table>
             <br>
-            <input class="layui-btn" type="button" onclick="modalModifyItem()" value=修改>
+            <input class="layui-btn" type="button" onclick="modalAddItem()" value=新增道具>
             <hr class="hr15">
             <input value="修改" class="layui-btn" style="width:100%;" type="button" onclick="modifyExchangeCode()">
             <br>
@@ -106,7 +117,7 @@
         {{range .infoList}}
           <tr>
             <td style = "text-align:center;">
-              <input class="layui-btn" type="button" onclick="OpenModifyItem({{.Pcode}}, {{.AwardTimes}}, {{.ExpireTime}}), {{.Items}}" value=修改>
+              <input class="layui-btn" type="button" onclick="OpenModifyItem({{.Pcode}}, {{.AwardTimes}}, {{.ExpireTime}}, {{.Items}})" value=修改>
               {{"   | "}}
               <input class="layui-btn" type="button" onclick="clickDelete({{.Pcode}})" value=删除>
             </td>
@@ -140,10 +151,13 @@
           return res;
       }
 
+      var isModelAdd = true
       var codeItems = [];
       // 刷新物品列表
       function refreshTableItem() {
-        var obj = document.getElementById("tb_item")
+        var key = "tb_item"
+        if (isModelAdd == false){key = "tb_item_modify"}
+        var obj = document.getElementById(key)
         var tbody = obj.getElementsByTagName("tbody")[0];
         if (tbody) {
           if (-[1,]) {
@@ -185,8 +199,6 @@
       }
       // 物品弹窗
       function modalAddItem() {
-        console.log("modalAddItem codeItems:"+codeItems)
-
         refreshTableItem()
 
         document.getElementById("modalItem").hidden = false;
@@ -247,6 +259,7 @@
         document.getElementById("pcode").value = generateMixed(6);
       }
       function OpenAddItem() {
+        isModelAdd = true
         document.getElementById("pcode").value = generateMixed(6);
         document.getElementById("awardTimes").value = 100;
 
@@ -266,9 +279,29 @@
         var expireTime = document.getElementById("expireTime").value;
 
         if (pcode.length != 6){
-          alert("兑换码错误！请设置6位大写字母");
+          alert("兑换码长度错误！6位大写字母");
+          return;
+        }
+        // 兑换码字符检查
+        var isMatch = true
+        for (var i = 0; i < pcode.length; i ++){
+          for (var j = 0; j < randChats.length; j ++) {
+            if (pcode[i] == randChats[j]){
+              console.info("兑换码字符检查 i:"+i+";"+pcode[i])
+              console.info("兑换码字符检查 j:"+j+";"+randChats[j])
+              isMatch = false;
+              break;
+            }
+          }
+          if (isMatch == false) {
+            break;
+          }
+        }
+        if (isMatch == false){
+          alert("兑换码错误！请使用大写字母");
           return;
         }
+
         if (awardTimes <= 0){
           alert("请正确设置领奖次数");
           return;
@@ -309,25 +342,40 @@
         });
       }
 
-      function OpenModifyItem(id, channel, version, addr, filesize) {
-        document.getElementById("modify_id").value = id;
-        document.getElementById("channelmodify").value = channel;
-        document.getElementById("versionmodify").value = version;
-        document.getElementById("addrmodify").value = addr;
-        document.getElementById("filesizemodify").value = filesize;
+      function closeModalItem() {
+        document.getElementById("modalItem").hidden = true;
+      }
+
+      function OpenModifyItem(pcode, awardTimes, expireTime, items) {
+        isModelAdd = false;
+
+        codeItems = []
+        for (var i = 0; i < items.length; i ++) {
+          codeItems.push({'id':items[i].id, 'count':items[i].count, 'weight':items[i].weight});
+        }
+
+        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()
+
         document.getElementById("modalModify").hidden = false;
       }
-      function closeModifyItem() {
+      function closeModalModify() {
         document.getElementById("modalModify").hidden = true;
       }
 
-      function modifyItem () {
-        var id = document.getElementById("modify_id").value;
-        var channel = document.getElementById("channelmodify").value;
-        var version = document.getElementById("versionmodify").value;
-        var addr = document.getElementById("addrmodify").value;
-        var filesize = document.getElementById("filesizemodify").value;
-        var text = "channel=" + encodeURI(channel) + "&version=" + encodeURI(version) + "&addr=" + encodeURI(addr) + "&filesize=" + encodeURI(filesize) + "&id=" + encodeURI(id) + "&action=modify";
+      function modifyExchangeCode () {
+        var pcode = document.getElementById("pcode_modify").value;
+        var awardTimes = document.getElementById("awardTimes_modify").value;
+        var expireTime = document.getElementById("expireTime_modify").value;
+
+        var text = "token=" + encodeURI(token);
+        text += "&pcode=" + encodeURI(pcode);
+        text += "&awardTimes=" + encodeURI(awardTimes);
+        text += "&expireTime=" + encodeURI(expireTime);
+        text += "&items=" + encodeURI(JSON.stringify(codeItems));
 
         $.ajax({
           type:"put",
@@ -347,8 +395,9 @@
         });
       }
 
-      function clickDelete (id) {
-        var text = "id=" + encodeURI(id) + "&action=delete";
+      function clickDelete (pcode) {
+        var text = "token=" + encodeURI(token);
+        text += "&pcode=" + encodeURI(pcode);
 
         $.ajax({
           type:"delete",