Merge branch 'master' of 8.134.163.21:box/box-server

dev/data/pay.lua

@@ -7,7 +7,6 @@ LastEditors: Neo,Huang
 LastEditTime: 2022-03-14 20:21:10
 --]]
 local timeUtil = require("utils.timeUtil")
-local util_user = require("utils.util_user")
 
 local shopAdapt = require("adapt.shopAdapt")
 
@@ -201,4 +200,36 @@ function root:pack_goods_pay_custom_info_list(uid)
     end
 end
 
+-- 打包 - 支付信息
+function root:pack_pay_info(uid)
+    if is_empty(uid) then
+        return
+    end
+    local payInfo = {}
+
+    -- 终生
+    payInfo.totalTimes = 0
+    payInfo.totalMoney = 0
+    local goodsList = moduleData:hget_json(uid, MODULE_NAME, "goodsList")
+    if not is_empty(goodsList) then
+        for _, v in ipairs(goodsList) do
+            payInfo.totalTimes = payInfo.totalTimes + 1
+            payInfo.totalMoney = payInfo.totalMoney + v.amount
+        end
+    end
+
+    -- 当天
+    payInfo.dayMoney = 0
+    payInfo.dayTimes = 0
+    local dayInfo = self:get_day_info(uid)
+    if not is_empty(dayInfo.goodsList) then
+        for _, v in ipairs(dayInfo.goodsList) do
+            payInfo.dayTimes = payInfo.dayTimes + 1
+            payInfo.dayMoney = payInfo.dayMoney + v.amount
+        end
+    end
+
+    return payInfo
+end
+
 return root

dev/modules/pay.lua

@@ -66,6 +66,8 @@ function root:dispatch_goods_items(role, gid)
     end
     util_user:user_dispatch_event(uid, gameConst.EVENT_ID.PAY, evtParams)
 
+    util_user:user_proto_notify(uid, "on_shop_pay_info", {payInfo = payData:pack_pay_info(uid)})
+
     return code.OK, {items = items}
 end
 

dev/utils/util_roll.lua

@@ -0,0 +1,146 @@
+--[[
+Descripttion:roll房
+version:
+Author: Neo,Huang
+Date: 2023-11-21 23:01:45
+LastEditors: Neo,Huang
+LastEditTime: 2023-11-21 23:01:59
+--]]
+local code = require("code")
+local lib_game_redis = require("lib_game_redis")
+local redisUtil = require("utils.redisUtil")
+local util_player = require("utils.util_player")
+local timeUtil = require("utils.timeUtil")
+local nodeMgr = require("nodeMgr")
+
+local userData = require("data.user")
+local payData = require("data.pay")
+
+local ROLL_MAIN_KEY = "roll:room"
+
+local root = {}
+
+local function _get_roll_room_key(rid)
+    return string.format("%s:%s", ROLL_MAIN_KEY, tostring(rid))
+end
+-- 打包 - 房间信息
+function root:pack_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 info = {
+        roomId = rid,
+        name = redisUtil.hget(key, "name"),
+        bandShareCode = redisUtil.hget(key, "bandShareCode"),
+        createTime = redisUtil.hget_int(key, "createTime"),
+        showStartTime = redisUtil.hget_int(key, "showStartTime"),
+        signupStartTime = redisUtil.hget_int(key, "signupStartTime"),
+        signupEndTime = redisUtil.hget_int(key, "signupEndTime"),
+        awardTime = redisUtil.hget_int(key, "awardTime"),
+        conditions = redisUtil.hget_json(key, "conditions"),
+        itemIdList = redisUtil.hget_json(key, "itemIdList")
+    }
+    -- 玩家信息
+    local signupUidList = redisUtil.hget_json(key, "signupUidList")
+    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
+
+    return info
+end
+-- 打包 - 所有活跃房间
+function root:pack_roll_room_info_list()
+    local roomIdList = lib_game_redis:smembers(ROLL_MAIN_KEY)
+    if is_empty(roomIdList) then
+        return
+    end
+    local roomInfoList = {}
+    for _, v in ipairs(roomIdList) do
+        local rid = tonumber(v)
+        local roomInfo = self:pack_roll_room_info(rid)
+        if not is_empty(roomInfo) then
+            table.insert(roomInfoList, roomInfo)
+        end
+    end
+    return roomInfoList
+end
+
+-- 报名
+function root:sign_up(uid, roomId)
+    if is_empty(uid) or is_empty(roomId) then
+        return code.PARAMTER_ERROR
+    end
+    local key = _get_roll_room_key(roomId)
+    local isExist = lib_game_redis:exists(key)
+    if not isExist then
+        -- 房间已不存在
+        return code.UNKNOWN
+    end
+    -- 是否已报名
+    local signupUidList = redisUtil.hget_json(key, "signupUidList")
+    if table.include(signupUidList, uid) then
+        return code.UNKNOWN
+    end
+    -- 是否绑定推广码
+    local bandShareCode = redisUtil.hget(key, "bandShareCode")
+    if not is_empty(bandShareCode) then
+        local _bandShareCode = userData:get_key_info(uid, "bandShareCode")
+        if bandShareCode ~= _bandShareCode then
+            return code.UNKNOWN
+        end
+    end
+    -- 报名时间
+    local currTime = timeUtil.now(uid)
+    local signupStartTime = redisUtil.hget_int(key, "signupStartTime")
+    if signupStartTime > currTime then
+        -- 未开始报名
+        return code.UNKNOWN
+    end
+    local signupEndTime = redisUtil.hget_int(key, "signupEndTime")
+    if currTime > signupEndTime then
+        -- 报名已结束
+        return code.UNKNOWN
+    end
+    -- 报名条件
+    local conditions = redisUtil.hget_json(key, "conditions")
+    if not is_empty(conditions) then
+        for _, v in ipairs(conditions) do
+            local playerValue = nil
+            if v.c == "pay_day_totalAmount" then
+                -- 今日充值
+                playerValue = payData:get_day_total_amount(uid)
+            end
+            if v.cv > playerValue then
+                return code.UNKNOWN
+            end
+        end
+    end
+    -- 报名成功
+    table.insert(signupUidList, uid)
+    redisUtil.hset(key, "signupUidList", signupUidList)
+
+    -- 广播
+    local pack = {
+        roomId = roomId,
+        playerInfo = util_player:get_base_info(uid)
+    }
+    nodeMgr.broadcast_proto_notify("on_roll_player", pack)
+
+    return code.OK
+end
+
+return root

nodes/game/interface/roll.lua

@@ -0,0 +1,26 @@
+--[[
+Descripttion:roll房
+version:
+Author: Neo,Huang
+Date: 2023-11-21 23:02:31
+LastEditors: Neo,Huang
+LastEditTime: 2023-11-21 23:02:43
+--]]
+local code = require "code"
+local util_roll = require("utils.util_roll")
+
+local root = {}
+
+-- 获取房间列表
+function root:roll_get_info(role, msg)
+    local roomInfoList = util_roll:pack_roll_room_info_list()
+    return code.OK, {roomList = roomInfoList}
+end
+
+-- 报名
+function root:roll_sign_up(role, msg)
+    local roomId = msg.roomId
+    return util_roll:sign_up(role.uid, roomId)
+end
+
+return root

nodes/game/interface/user.lua

@@ -10,6 +10,8 @@ local code = require "code"
 local timeUtil = require("utils.timeUtil")
 local util_user = require("utils.util_user")
 
+local payData = require("data.pay")
+
 local root = {}
 
 function root:user_keepalive(role)
@@ -22,7 +24,10 @@ function root:user_self_info(role, msg)
 end
 -- 登录完成后
 function root:after_user_self_info(role, msg)
-    local pack = {}
+    local uid = role.uid
+    local pack = {
+        payInfo = payData:pack_pay_info(uid)
+    }
     util_user:user_proto_notify(role.uid, "on_user_system_info", pack)
 end
 

nodes/global/service/rollSrv.lua

@@ -11,7 +11,9 @@ local baseService = require("baseService")
 local lib_game_redis = require("lib_game_redis")
 local redisUtil = require("utils.redisUtil")
 local util_mail = require("utils.util_mail")
-local timeUtil = require "utils.timeUtil"
+local timeUtil = require("utils.timeUtil")
+local nodeMgr = require("nodeMgr")
+local util_roll = require("utils.util_roll")
 
 local resAdapt = require("adapt.resAdapt")
 
@@ -95,8 +97,8 @@ local function _roll_award(rid)
 	for _, uid in ipairs(signupUidList) do
 		if mapUidItems[uid] == nil then
 			local cnt = string.format("很遗憾，您参与的%sroll房活动中未获得奖励。", tostring(name))
+			util_mail:add_mail(uid, 0, title, cnt, {}, 0, nil, nil, "system")
 		end
-		util_mail:add_mail(uid, 0, title, cnt, {}, 0, nil, nil, "system")
 	end
 end
 -- 定时器结束
@@ -146,6 +148,11 @@ function root.add_roll(rid)
 		end
 		if not isMatch then
 			table.insert(root.rollList, {id = rid, awardTime = awardTime})
+			-- 广播 - 新房
+			local roomInfo = util_roll:pack_roll_room_info(rid)
+			if not is_empty(roomInfo) then
+				nodeMgr.broadcast_proto_notify("on_roll_new", {room = roomInfo})
+			end
 		end
 	end
 end