roll房，增加房间结算信息

dev/modules/roll.lua

@@ -25,7 +25,8 @@ function root:mysql_get_init_columns()
 		awardTime = "int(11) DEFAULT 0 COMMENT '开奖时间'",
 		conditions = "json COMMENT '参与条件列表'",
 		itemIdList = "json COMMENT '奖励物品ID列表'",
-		signupUidList = "json COMMENT '报名玩家ID列表列表'"
+		signupUidList = "json COMMENT '报名玩家ID列表列表'",
+		settle = "json COMMENT '结算信息'"
 	}
 end
 

dev/utils/util_order.lua

@@ -76,7 +76,6 @@ function root:is_order_exist(orderId)
         return false
     end
     local sql = string.format("SELECT 1 FROM `mdl_order` WHERE orderNo = '%s';", orderId)
-    lib_game_mysql:query(sql)
     local ok, ret = mysqlUtil:select(sql)
     if not ok or is_empty(ret) then
         return false

dev/utils/util_roll.lua

@@ -12,6 +12,7 @@ local redisUtil = require("utils.redisUtil")
 local util_player = require("utils.util_player")
 local timeUtil = require("utils.timeUtil")
 local nodeMgr = require("nodeMgr")
+local mysqlUtil = require("utils.mysqlUtil")
 
 local userData = require("data.user")
 local payData = require("data.pay")
@@ -44,7 +45,8 @@ function root:pack_roll_room_info(rid)
         signupEndTime = redisUtil.hget_int(key, "signupEndTime"),
         awardTime = redisUtil.hget_int(key, "awardTime"),
         conditions = redisUtil.hget_json(key, "conditions"),
-        itemIdList = redisUtil.hget_json(key, "itemIdList")
+        itemIdList = redisUtil.hget_json(key, "itemIdList"),
+        settleList = redisUtil.hget_json(key, "settle")
     }
     -- 玩家信息
     local signupUidList = redisUtil.hget_json(key, "signupUidList")
@@ -59,6 +61,7 @@ function root:pack_roll_room_info(rid)
             end
         end
     end
+    -- 结算
 
     return info
 end
@@ -78,6 +81,56 @@ function root:pack_roll_room_info_list()
     end
     return roomInfoList
 end
+-- 打包 - 玩家房间信息
+function root:pack_player_roll_room_info_list(uid)
+    if is_empty(uid) then
+        return
+    end
+    local sql = string.format("SELECT * FROM `mdl_roll` WHERE signupUidList like '%%s%';", tostring(uid))
+    local ok, ret = mysqlUtil:select(sql)
+    log.info("pack_player_roll_room_info_list sql[%s] ret[%s]", sql, tostring(ret))
+    if not ok or is_empty(ret) then
+        return
+    end
+    local roomInfoList = {}
+    for _, v in ipairs(ret) do
+        local id = tonumber(v.id)
+        local info = self:pack_roll_room_info(id)
+        if is_empty(info) then
+            info = {
+                roomId = id,
+                name = v.name,
+                bandShareCode = v.bandShareCode,
+                createTime = tonumber(v.createTime),
+                showStartTime = tonumber(v.showStartTime),
+                signupStartTime = tonumber(v.signupStartTime),
+                signupEndTime = tonumber(v.signupEndTime),
+                awardTime = tonumber(v.awardTime),
+                conditions = cjson_decode(v.conditions),
+                itemIdList = cjson_decode(v.itemIdList),
+                settleList = cjson_decode(v.settle)
+            }
+            -- 玩家信息
+            local signupUidList = nil
+            if not is_empty(v.signupUidList) then
+                signupUidList = cjson_decode(v.signupUidList)
+            end
+            if not is_empty(signupUidList) then
+                for _, uid in ipairs(signupUidList) do
+                    local playerInfo = util_player:get_base_info(uid)
+                    if not is_empty(playerInfo) then
+                        if info.signupPlayerList == nil then
+                            info.signupPlayerList = {}
+                        end
+                        table.insert(info.signupPlayerList, playerInfo)
+                    end
+                end
+            end
+        end
+        table.insert(roomInfoList, info)
+    end
+    return roomInfoList
+end
 
 -- 报名
 function root:sign_up(uid, roomId)
@@ -143,4 +196,21 @@ function root:sign_up(uid, roomId)
     return code.OK
 end
 
+-- 备份房间信息
+function root:backup_roll_room_info(rid)
+    if is_empty(rid) then
+        return
+    end
+    local key = _get_roll_room_key(rid)
+    local isExist = lib_game_redis:exists(key)
+    if not isExist then
+        -- 房间已不存在
+        return
+    end
+    local rollModule = require("modules.roll").new(rid)
+    rollModule:backup_to_db()
+
+    lib_game_redis:del(key)
+end
+
 return root

nodes/game/interface/roll.lua

@@ -23,4 +23,10 @@ function root:roll_sign_up(role, msg)
     return util_roll:sign_up(role.uid, roomId)
 end
 
+-- 我参与的房间
+function root:roll_get_self_room_list(role, msg)
+    local roomInfoList = util_roll:pack_player_roll_room_info_list(role.uid)
+    return code.OK, {roomList = roomInfoList}
+end
+
 return root

nodes/game/lib/role.lua

@@ -57,6 +57,7 @@ end
 function root:logout_modules()
     for _, cname in pairs(self.moduleList) do
         self[cname]:do_logout()
+        self[cname]:backup_to_db()
     end
     -- 删除玩家session信息
     sessionData:user_update_cluster_info(self.uid, "gate")

nodes/global/service/rollSrv.lua

@@ -55,9 +55,7 @@ local function _roll_award(rid)
 	end
 	local key = _get_room_key(rid)
 	-- 删除roll信息
-	lib_game_redis:del(key)
 	lib_game_redis:srem(MAIN_KEY, rid)
-	lib_game_redis:sismember(_get_room_award_key(), rid)
 
 	local signupUidList = redisUtil.hget_json(key, "signupUidList")
 	if is_empty(signupUidList) then
@@ -80,6 +78,7 @@ local function _roll_award(rid)
 		table.insert(mapUidItems[uid], {id = id, count = 1})
 	end
 	log.info("_roll_award mapUidItems[%s]", tostring(mapUidItems))
+	local settle = {}
 	local name = redisUtil.hget(key, "name")
 	local title = "roll房结算"
 	-- 中奖玩家发奖
@@ -92,6 +91,8 @@ local function _roll_award(rid)
 			cnt = cnt + string.format("\n%s", resAdapt:get_item_name(v.id))
 		end
 		util_mail:add_mail(uid, 0, title, cnt, {}, 0, nil, nil, "system")
+
+		table.insert(settle, {uid = uid, items = items})
 	end
 	-- 未中奖玩家邮件
 	for _, uid in ipairs(signupUidList) do
@@ -100,6 +101,11 @@ local function _roll_award(rid)
 			util_mail:add_mail(uid, 0, title, cnt, {}, 0, nil, nil, "system")
 		end
 	end
+	-- 保存结算
+	redisUtil.hset(key, "settle", settle)
+
+	-- 保存记录
+	util_roll:backup_roll_room_info(rid)
 end
 -- 定时器结束
 local function _timeout_award()