新增明细记录

common/service/statisticLogSrv.lua

@@ -5,12 +5,13 @@ local baseService = require("baseService")
 local timeUtil = require "utils.timeUtil"
 local serverLogUtil = require "utils.serverLogUtil"
 local lib_game_redis = require("lib_game_redis")
+local util_record_item = require("utils.util_record_item")
 
 local moduleData = require("data.module")
 
 local SEND_COUNT, ACTIVE_SEND_COUNT
 if IS_TEST then
-    SEND_COUNT, ACTIVE_SEND_COUNT = 1, 10
+    SEND_COUNT, ACTIVE_SEND_COUNT = 2, 10
 else
     SEND_COUNT, ACTIVE_SEND_COUNT = 50, 100
 end
@@ -18,7 +19,9 @@ end
 local logQueue = {}
 local lTimerLogSync = nil -- 同步日志定时器
 local timeSync = 600 * 100
-local tabKeyFind = table.key_find
+-- 资源变化日志
+local itemList = {}
+local timerItem = nil
 
 local logAddr
 local function l_sned_logs_to_resource(logList)
@@ -62,16 +65,63 @@ local function l_sync_log_data()
     end
 end
 
+-- 写入数据库
+local function _write_to_db(stop)
+    -- 销毁定时器
+    if timerItem then
+        timerItem.delete()
+        timerItem = nil
+    end
+
+    local count = 0
+    if stop then
+        count = #itemList
+    else
+        count = math.min(SEND_COUNT, #itemList)
+    end
+
+    local list = {}
+    for i = 1, count do
+        table.insert(list, table.remove(itemList, 1))
+    end
+
+    if #list <= 0 then
+        return
+    end
+    util_record_item:add_item_record(list)
+
+    if #itemList > 0 then
+        if timerItem == nil then
+            timerItem = create_timeout(timeSync, _write_to_db)
+        end
+    end
+end
+-- 同步资源日志
+local function l_sync_item_data()
+    if #itemList >= SEND_COUNT then
+        _write_to_db()
+    else
+        if timerItem == nil then
+            timerItem = create_timeout(timeSync, _write_to_db)
+        end
+    end
+end
+
 local function l_sync_active_log_data(filename, dataStr)
     l_sned_logs_to_resource({{filename = filename, dataStr = dataStr}})
 end
 
 local root = {}
 
-function root.add_file_log(key, date, dataStr)
+function root.add_file_log(key, date, cnt)
     local filename = string.format("%s-%s", key, date)
-    table.insert(logQueue, {filename = filename, dataStr = dataStr})
+    table.insert(logQueue, {filename = filename, dataStr = cnt})
     l_sync_log_data()
+    -- 资源变化
+    if key == "resource" then
+        table.insert(itemList, cnt)
+        l_sync_item_data()
+    end
 end
 
 -- 活跃用户埋点
@@ -80,13 +130,6 @@ local bagData = require("data.bag")
 local function l_log_user_active(uid, date)
     local lastLoginTime = timeUtil.toString(moduleData:hget_int(uid, "player", "lastLoginTime"))
 
-    local mainProgress = ""
-    do
-        local maxChapterId = moduleData:hget_int(uid, "tb_pve_stars", "maxChapterId") or 1 --
-        local passLevel = moduleData:hget_int(uid, "tb_pve_stars", "passLevel") or 0 --
-        mainProgress = maxChapterId .. "-" .. passLevel
-    end
-
     local data = {
         date,
         uid or 0,

common/utils/serverLogUtil.lua

@@ -7,7 +7,6 @@ local root = {}
 
 local function writeServerLog(key, date, data)
     assert(key and date)
-    local file = string.format("%s-%s", key, date)
     skynet.send("statisticLog", "lua", "add_file_log", key, date, data)
 end
 
@@ -60,7 +59,7 @@ function root.logResource(uid, eventId, itemId, resChgs, resResult, channel, ban
 
     local cnt =
         string.format(
-        "%s;%s;%s;%s;%s;%s;%s;%s;%s;",
+        "%s;%s;%s;%s;%s;%s;%s;%s;%s",
         tostring(date),
         tostring(dateStr),
         tostring(uid),

dev/utils/util_record_item.lua

@@ -0,0 +1,117 @@
+--[[
+Descripttion:明细
+version:
+Author: Neo,Huang
+Date: 2023-11-22 22:52:54
+LastEditors: Neo,Huang
+LastEditTime: 2023-11-22 23:29:30
+--]]
+local mysqlUtil = require("utils.mysqlUtil")
+local timeUtil = require("utils.timeUtil")
+local gameConst = require("const.gameConst")
+
+local root = {}
+
+-- 新增记录
+function root:add_item_record(list)
+    if is_empty(list) then
+        return
+    end
+    -- 2023-11-22;2023-11-22 20:35:51;1000001;nil;999;shop-pay-10203;102;680;3400;
+    local columns = "(`createTime`,`uid`,`bandShareCode`,`channel`,`eventId`,`itemId`,`delta`,`remainCount`)"
+    local values = nil
+    for _, v in ipairs(list) do
+        local params = string.split(v, ";")
+        local value =
+            string.format(
+            "(%s,%s,'%s',%s,'%s',%s,%s,%s)",
+            getTimestamp(params[2]), -- createTime
+            tostring(params[3]), -- uid
+            tostring(params[4]), -- bandShareCode
+            tostring(params[5]), -- channel
+            tostring(params[6]), -- eventId
+            tostring(params[7]), -- itemId
+            tostring(params[8]), -- delta
+            tostring(params[9]) -- remainCount
+        )
+        if values == nil then
+            values = value
+        else
+            values = string.format("%s,%s", values, value)
+        end
+    end
+
+    local sql = string.format("INSERT INTO `mdl_itemrecord` %s VALUES %s; ", columns, values)
+
+    local ok = mysqlUtil:insert(sql)
+    log.info("add_battle_record sql[%s] ok[%s]", tostring(sql), tostring(ok))
+    return ok
+end
+
+-- 打包明细
+function root:pack_item_record_list(data)
+    local list = {}
+    if is_empty(data) then
+        return list
+    end
+    for _, v in ipairs(data) do
+        local info = {
+            id = tonumber(v.id),
+            createTime = tonumber(v.createTime),
+            reason = v.eventId,
+            itemId = tonumber(v.itemId),
+            delta = tonumber(v.delta),
+            remainCount = tonumber(v.remainCount)
+        }
+        table.insert(list, info)
+    end
+    return list
+end
+
+-- 获取流水记录
+function root:get_gold_record(uid, lastTime)
+    if is_empty(uid) then
+        return
+    end
+    lastTime = lastTime or timeUtil.now()
+    local count = 20
+    local sql =
+        string.format(
+        "SELECT * FROM `mdl_itemrecord` WHERE `uid`=%s and (`itemId`=%s or `itemId`=%s) `createTime`<%s ORDER BY createTime DESC limit %s",
+        tostring(uid),
+        tostring(gameConst.ITEM_ID.GOLD),
+        tostring(gameConst.ITEM_ID.DIAMOND),
+        tostring(lastTime),
+        tostring(count)
+    )
+    local ok, ret = mysqlUtil:select(sql)
+    if not ok or is_empty(ret) then
+        return
+    end
+    return self:pack_item_record_list(ret)
+end
+
+-- 获取流水记录
+function root:get_wapon_record(uid, lastTime)
+    if is_empty(uid) then
+        return
+    end
+    lastTime = lastTime or timeUtil.now()
+    local count = 20
+    local sql =
+        string.format(
+        "SELECT * FROM `mdl_itemrecord` WHERE `uid`=%s and `itemId`!=%s and `itemId`!=%s `createTime`<%s ORDER BY createTime DESC limit %s",
+        tostring(uid),
+        tostring(gameConst.ITEM_ID.GOLD),
+        tostring(gameConst.ITEM_ID.DIAMOND),
+        tostring(lastTime),
+        tostring(count)
+    )
+    local ok, ret = mysqlUtil:select(sql)
+    if not ok or is_empty(ret) then
+        return
+    end
+    return self:pack_item_record_list(ret)
+end
+
+return root

dev/utils/util_user.lua

@@ -9,7 +9,6 @@ LastEditTime: 2022-05-26 19:46:41
 local skynet = require("skynet")
 local serverLogUtil = require("utils.serverLogUtil")
 local nodeMgr = require("nodeMgr")
-local code = require("code")
 
 local moduleData = require("data.module")
 local userData = require("data.user")

nodes/game/interface/user.lua

@@ -1,4 +1,12 @@
 --[[
+Descripttion:
+version:
+Author: Neo,Huang
+Date: 2023-11-15 22:34:35
+LastEditors: Neo,Huang
+LastEditTime: 2023-11-23 00:10:07
+--]]
+--[[
 Descripttion:玩家
 version:
 Author: Neo,Huang
@@ -6,6 +14,7 @@ Date: 2023-11-15 22:34:35
 LastEditors: Neo,Huang
 LastEditTime: 2023-11-15 23:19:26
 --]]
+local skynet = require("skynet")
 local code = require "code"
 local timeUtil = require("utils.timeUtil")
 local util_user = require("utils.util_user")
@@ -76,4 +85,15 @@ function root:user_identity_update_info(role, msg)
     return role.user:itf_identity(role, msg)
 end
 
+-- 明细 - 流水
+function root:user_item_detail_gold(role, msg)
+    skynet.send(".srvItemRecord", "lua", "get_item_detail_gold", role.uid, msg.lastTime)
+    return code.OK
+end
+-- 明细 - 饰品
+function root:user_item_detail_wapon(role, msg)
+    skynet.send(".srvItemRecord", "lua", "get_item_detail_wapon", role.uid, msg.lastTime)
+    return code.OK
+end
+
 return root

nodes/game/main.lua

@@ -28,6 +28,8 @@ skynet.start(
         skynet.uniqueservice("srvConfig")
         -- agent管理器
         skynet.uniqueservice("srvAgentMgr")
+        -- 明细
+        skynet.uniqueservice("srvItemRecord")
 
         -- 集群
         init_nodes:init_cluster()

nodes/game/service/srvItemRecord.lua

@@ -0,0 +1,54 @@
+--[[
+Descripttion:明细
+version:
+Author: Neo,Huang
+Date: 2023-11-22 23:59:15
+LastEditors: Neo,Huang
+LastEditTime: 2023-11-23 00:00:24
+--]]
+local baseService = require("baseService")
+local util_record_item = require("utils.util_record_item")
+local util_user = require("utils.util_user")
+
+local root = {}
+
+-- 获取流水
+function root.get_item_detail_gold(uid, lastTime)
+	if is_empty(uid) then
+		return
+	end
+	local list = util_record_item:get_gold_record(uid, lastTime)
+	if list == nil then
+		return
+	end
+	local pack = {
+		count = #list,
+		list = list
+	}
+	util_user:user_proto_notify(uid, "on_user_item_detail_gold", pack)
+end
+-- 获取饰品
+function root.get_item_detail_wapon(uid, lastTime)
+	if is_empty(uid) then
+		return
+	end
+	local list = util_record_item:get_wapon_record(uid, lastTime)
+	if list == nil then
+		return
+	end
+	local pack = {
+		count = #list,
+		list = list
+	}
+	util_user:user_proto_notify(uid, "on_user_item_detail_wapon", pack)
+end
+
+function root.onStart()
+	return true
+end
+
+function root.onStop()
+	return true
+end
+
+baseService.start(root, ".srvItemRecord")