修改兑换码存储方式

models/exchangecode.go

@@ -36,6 +36,11 @@ var exchangeCodeList ExchangeCodeInfoArray
 var ecMutex sync.Mutex
 var MAIN_KEY = "exchange:code"
 
+// 兑换码key
+func get_exchange_code_key(pcode string) string {
+	return fmt.Sprintf("%s:%s", MAIN_KEY, pcode)
+}
+
 // 初始化兑换码
 func InitExchangeCodeInfo() {
 	pool := utils.GetAccountRedisPool()
@@ -46,17 +51,26 @@ func InitExchangeCodeInfo() {
 	rd := pool.Get()
 	defer rd.Close()
 
-	result, err := redis.Values(rd.Do("hgetall", MAIN_KEY))
-	if err != nil {
-		return
-	}
-	for i := 0; i < len(result)/2; i++ {
-
-		info := &ExchangeCodeInfo{}
-		_err := json.Unmarshal(result[i*2+1].([]byte), info)
-		if _err == nil {
-			exchangeCodeList = append(exchangeCodeList, info)
-		}
+	result, _ := redis.Values(rd.Do("smembers", MAIN_KEY))
+	for _, v := range result {
+		pcode := v.(string)
+		pKey := get_exchange_code_key(pcode)
+		awardTimes, _ := redis.Int64(rd.Do("hget", pKey, "awardTimes"))
+		creatTime, _ := redis.Int64(rd.Do("hget", pKey, "creatTime"))
+		modifyTime, _ := redis.Int64(rd.Do("hget", pKey, "modifyTime"))
+		expireTime, _ := redis.Int64(rd.Do("hget", pKey, "expireTime"))
+		items, _ := redis.String(rd.Do("hget", pKey, "items"))
+
+		var _items []*ExchangeItemsInfo
+		json.Unmarshal([]byte(items), &_items)
+		exchangeCodeList = append(exchangeCodeList, &ExchangeCodeInfo{
+			Pcode:      pcode,
+			AwardTimes: awardTimes,
+			CreateTime: creatTime,
+			ModifyTime: modifyTime,
+			ExpireTime: expireTime,
+			Items:      _items,
+		})
 	}
 
 	beego.Info("load exchange code info", len(exchangeCodeList))
@@ -90,16 +104,20 @@ func AddExchangeCodeInfo(hf *ExchangeCodeInfo) error {
 	hf.CreateTime = time.Now().Unix()
 	hf.ModifyTime = hf.CreateTime
 
-	buff, err := json.Marshal(hf)
-	_, err = rd.Do("hset", MAIN_KEY, hf.Pcode, buff)
+	pKey := get_exchange_code_key(hf.Pcode)
+	rd.Do("hset", pKey, "awardTimes", hf.AwardTimes)
+	rd.Do("hset", pKey, "creatTime", hf.CreateTime)
+	rd.Do("hset", pKey, "modifyTime", hf.ModifyTime)
+	rd.Do("hset", pKey, "expireTime", hf.ExpireTime)
+	items, _ := json.Marshal(hf.Items)
+	rd.Do("hset", pKey, "items", items)
+	rd.Do("sadd", MAIN_KEY, hf.Pcode)
 
-	if err == nil {
-		ecMutex.Lock()
-		exchangeCodeList = append(exchangeCodeList, hf)
-		ecMutex.Unlock()
-	}
+	ecMutex.Lock()
+	exchangeCodeList = append(exchangeCodeList, hf)
+	ecMutex.Unlock()
 
-	return err
+	return nil
 }
 
 // 修改兑换码
@@ -117,11 +135,13 @@ func UpdateExchangeCodeInfo(hf *ExchangeCodeInfo) error {
 
 	hf.ModifyTime = time.Now().Unix()
 
-	buff, err := json.Marshal(hf)
-	_, err = rd.Do("hset", MAIN_KEY, hf.Pcode, buff)
-	if err != nil {
-		return err
-	}
+	pKey := get_exchange_code_key(hf.Pcode)
+	rd.Do("hset", pKey, "awardTimes", hf.AwardTimes)
+	rd.Do("hset", pKey, "modifyTime", hf.ModifyTime)
+	rd.Do("hset", pKey, "expireTime", hf.ExpireTime)
+	items, _ := json.Marshal(hf.Items)
+	rd.Do("hset", pKey, "items", items)
+	rd.Do("sadd", MAIN_KEY, hf.Pcode)
 
 	ecMutex.Lock()
 	for i := 0; i < len(exchangeCodeList); i++ {
@@ -137,7 +157,7 @@ func UpdateExchangeCodeInfo(hf *ExchangeCodeInfo) error {
 	}
 	ecMutex.Unlock()
 
-	return err
+	return nil
 
 }
 
@@ -153,7 +173,9 @@ func DelExchangeCodeInfoById(pcode string) error {
 	ecMutex.Lock()
 	defer ecMutex.Unlock()
 
-	_, err := rd.Do("hdel", MAIN_KEY, pcode)
+	rd.Do("srem", MAIN_KEY, pcode)
+	pKey := get_exchange_code_key(pcode)
+	_, err := rd.Do("del", pKey)
 	if err != nil {
 		log.Println(err)
 		return err

views/exchangecode.tpl

@@ -283,24 +283,21 @@
           return;
         }
         // 兑换码字符检查
-        var isMatch = true
         for (var i = 0; i < pcode.length; i ++){
+          var isMatch = false
           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;
+              isMatch = true;
               break;
             }
           }
-          if (isMatch == false) {
-            break;
+          if (isMatch == false){
+            alert("兑换码错误！请使用大写字母");
+            return;
           }
         }
-        if (isMatch == false){
-          alert("兑换码错误！请使用大写字母");
-          return;
-        }
 
         if (awardTimes <= 0){
           alert("请正确设置领奖次数");