新增支付/调试功能模块

dev/adapt/resAdapt.lua

@@ -0,0 +1,41 @@
+-- 资源配置
+local baseAdapt = require "base.baseAdapt"
+
+local root = {}
+
+-- 获取指定id的资源配置
+function root:get_init_conf()
+    return baseAdapt:getConfig("ResInitConfig")
+end
+
+-- 获取物品配置
+function root:get_item_conf_list()
+    return baseAdapt:getConfig("ResItemConfig") or {}
+end
+
+-- 获取指定id的资源配置
+function root:get_item_conf(id)
+    if not id then
+        return nil
+    end
+    return baseAdapt:getOneConfig("ResItemConfig", id)
+end
+
+-- 获取物品名称
+function root:get_item_name(id)
+    local item = self:get_item_conf(id)
+    return item and item.name
+end
+
+-- 获取物品类型
+function root:get_item_type(id)
+    local item = self:get_item_conf(id)
+    return item and item.type
+end
+
+-- 判断是否是某个类型的资源id
+function root:is_type(id, resType)
+    return self:get_item_type(id) == resType
+end
+
+return root

dev/adapt/shopAdapt.lua

@@ -0,0 +1,42 @@
+--[[
+Descripttion:商城配置
+version:
+Author: Neo,Huang
+Date: 2022-08-19 17:36:25
+LastEditors: Neo,Huang
+LastEditTime: 2022-08-31 20:25:35
+--]]
+local baseAdapt = require "base.baseAdapt"
+
+local root = {}
+
+-- 商品信息
+function root:goods_get_info(gid)
+    if gid == nil then
+        return
+    end
+
+    local shConf = baseAdapt:getConfig("GoodsConfig")
+    for k, v in ipairs(shConf) do
+        if v.id == gid then
+            return v
+        end
+    end
+end
+-- 获取商品价格
+function root:goods_get_rmb(gid)
+    local conf = self:goods_get_info(gid)
+    if conf and conf.rmb then
+        return conf.rmb
+    end
+    return 0
+end
+-- 商品物品
+function root:goods_get_items(gid)
+    local conf = self:goods_get_info(gid)
+    if conf and not is_empty(conf.items) then
+        return table.copy(conf.items)
+    end
+end
+
+return root

dev/base/baseModule.lua

@@ -11,11 +11,12 @@ local lib_game_mysql = require("lib_game_mysql")
 
 local root = class("base")
 
-function root:ctor(uid, mdlName, keyName, isSaveDB)
+function root:ctor(uid, mdlName, keyName, isSaveDB, isPersonal)
     self.uid = uid
     self.mdlName = mdlName
     self.keyName = keyName
     self.isSaveDB = isSaveDB
+    self.isPersonal = isPersonal or true
 end
 
 -- 模块sql属性

dev/const/gameConst.lua

@@ -17,7 +17,8 @@ root.TASK_STATUS = {
 
 -- 事件ID
 root.EVENT_ID = {
-    RES = 101 -- 资源变化
+    RES = 101, -- 资源变化
+    PAY = 102 -- 支付
 }
 
 -- 战斗类型

dev/data/pay.lua

@@ -0,0 +1,204 @@
+--[[
+Descripttion:支付
+version:
+Author: Neo,Huang
+Date: 2022-03-14 20:21:10
+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")
+
+local moduleData = require("data.module")
+
+local MODULE_NAME = "pay"
+
+local root = {}
+
+-- 支付金额:分
+-- 新增支付
+function root:user_add_pay(uid, gid, pennys)
+    log.info("user_add_pay uid[%s] gid[%s] pennys[%s]", tostring(uid), tostring(gid), tostring(pennys))
+    if uid == nil or gid == nil then
+        return
+    end
+    -- 总金额
+    pennys = pennys or shopAdapt:goods_get_rmb(gid)
+    local totalAmount = moduleData:hget_int(uid, MODULE_NAME, "totalAmount")
+    totalAmount = totalAmount + pennys
+    moduleData:hset(uid, MODULE_NAME, "totalAmount", totalAmount)
+    -- 购买商品列表
+    local currTime = timeUtil.now(uid)
+    local goodsList = moduleData:hget_json(uid, MODULE_NAME, "goodsList")
+    table.insert(goodsList, {gid = gid, amount = pennys, time = currTime})
+    moduleData:hset(uid, MODULE_NAME, "goodsList", goodsList)
+    -- 当天信息
+    local dayInfo = self:get_day_info(uid)
+    dayInfo.lastPayTime = currTime
+    if dayInfo.goodsList == nil then
+        dayInfo.goodsList = {}
+    end
+    table.insert(dayInfo.goodsList, {gid = gid, amount = pennys, time = currTime})
+    moduleData:hset(uid, MODULE_NAME, "dayInfo", dayInfo)
+
+    return true
+end
+-- 累计支付金额
+function root:user_get_total_pay_count(uid)
+    if uid == nil then
+        return
+    end
+    return moduleData:hget_int(uid, MODULE_NAME, "totalAmount")
+end
+
+-- 是否首次付费
+function root:is_first_pay(uid)
+    local goodsList = moduleData:hget_json(uid, MODULE_NAME, "goodsList")
+    return is_empty(goodsList)
+end
+-- 是否商品首次付费
+function root:is_goods_first_pay(uid, gid)
+    local goodsList = moduleData:hget_json(uid, MODULE_NAME, "goodsList")
+    for _, v in ipairs(goodsList) do
+        if v.gid == gid then
+            return false
+        end
+    end
+    return true
+end
+-- 商品购买次数
+function root:get_goods_pay_times(uid, gid)
+    local times = 0
+    local goodsList = moduleData:hget_json(uid, MODULE_NAME, "goodsList")
+    for _, v in ipairs(goodsList) do
+        if v.gid == gid then
+            times = times + 1
+        end
+    end
+    return times
+end
+
+----------------------------------------
+-- 当天
+----------------------------------------
+-- 获取信息
+function root:get_day_info(uid)
+    local currTime = timeUtil.now(uid)
+    local dayInfo = moduleData:hget_json(uid, MODULE_NAME, "dayInfo")
+    if dayInfo.lastPayTime and not timeUtil.is_same_day(dayInfo.lastPayTime, currTime) then
+        dayInfo = {}
+    end
+    return dayInfo
+end
+-- 支付金额
+function root:get_day_total_amount(uid)
+    local dayInfo = self:get_day_info(uid)
+    local amount = 0
+    if not is_empty(dayInfo.goodsList) then
+        for _, v in ipairs(dayInfo.goodsList) do
+            amount = amount + v.amount
+        end
+    end
+    return amount
+end
+----------------------------------------
+-- 商品定制
+----------------------------------------
+-- 定制商品物品
+function root:update_goods_pre_custom_items(uid, gid, items)
+    if uid == nil or gid == nil or is_empty(items) then
+        return false
+    end
+    local goodsPreCustomItems = moduleData:hget_json(uid, MODULE_NAME, "goodsPreCustomItems")
+    local isMatch = false
+    for k, v in ipairs(goodsPreCustomItems) do
+        if v.gid == gid then
+            isMatch = true
+            v.items = items
+            break
+        end
+    end
+    if not isMatch then
+        table.insert(goodsPreCustomItems, {gid = gid, items = items})
+    end
+    moduleData:hset(uid, MODULE_NAME, "goodsPreCustomItems", goodsPreCustomItems)
+    return true
+end
+-- 打包 - 商品定制信息
+function root:pack_goods_pre_custom_info_list(uid)
+    if uid == nil then
+        return
+    end
+
+    local goodsPreCustomItems = moduleData:hget_json(uid, MODULE_NAME, "goodsPreCustomItems")
+    if not is_empty(goodsPreCustomItems) then
+        return goodsPreCustomItems
+    end
+end
+-- 获取商品定制物品
+function root:get_goods_pre_custom_items(uid, gid)
+    if uid == nil or gid == nil then
+        return
+    end
+    local goodsPreCustomItems = moduleData:hget_json(uid, MODULE_NAME, "goodsPreCustomItems")
+    for k, v in ipairs(goodsPreCustomItems) do
+        if v.gid == gid then
+            return v.items
+        end
+    end
+end
+-- 删除商品定制物品
+function root:del_goods_pre_custom_items(uid, gid)
+    if uid == nil or gid == nil then
+        return false
+    end
+    local goodsPreCustomItems = moduleData:hget_json(uid, MODULE_NAME, "goodsPreCustomItems")
+    for k, v in ipairs(goodsPreCustomItems) do
+        if v.gid == gid then
+            table.remove(goodsPreCustomItems, k)
+            moduleData:hset(uid, MODULE_NAME, "goodsPreCustomItems", goodsPreCustomItems)
+            return true
+        end
+    end
+    return false
+end
+
+-- 支付 - 更新商品定制物品
+function root:update_goods_pay_custom_items(uid, gid, items)
+    if uid == nil or gid == nil then
+        return false
+    end
+    local goodsPayCustomItems = moduleData:hget_json(uid, MODULE_NAME, "goodsPayCustomItems")
+    local isMatch = false
+    for k, v in ipairs(goodsPayCustomItems) do
+        if v.gid == gid then
+            isMatch = true
+            if is_empty(items) then
+                table.remove(goodsPayCustomItems, k)
+            else
+                v.items = items
+            end
+            break
+        end
+    end
+    if not isMatch then
+        table.insert(goodsPayCustomItems, {gid = gid, items = items})
+    end
+    moduleData:hset(uid, MODULE_NAME, "goodsPayCustomItems", goodsPayCustomItems)
+    return true
+end
+-- 打包 - 商品定制信息
+function root:pack_goods_pay_custom_info_list(uid)
+    if uid == nil then
+        return
+    end
+
+    local goodsPayCustomItems = moduleData:hget_json(uid, MODULE_NAME, "goodsPayCustomItems")
+    if not is_empty(goodsPayCustomItems) then
+        return goodsPayCustomItems
+    end
+end
+
+return root

dev/data/session.lua

@@ -8,7 +8,7 @@ LastEditTime: 2021-09-17 10:06:57
 --]]
 local moduleData = require("data.module")
 
-local MODULE_NAME = "tb_session"
+local MODULE_NAME = "session"
 
 local root = {}
 

dev/modules/order.lua

@@ -0,0 +1,38 @@
+--[[
+Descripttion:支付订单模块
+version:
+Author: Neo,Huang
+Date: 2022-08-17 16:04:20
+LastEditors: Neo,Huang
+LastEditTime: 2022-09-05 10:05:30
+--]]
+local root = class("moduleOrder", require("base.baseModule"))
+
+function root:ctor()
+    root.super.ctor(self, "order", "id", true, false)
+end
+
+function root:mysql_get_init_columns()
+    return {
+        id = "bigint(11) NOT NULL AUTO_INCREMENT COMMENT 'ID'",
+        payName = "varchar(64) DEFAULT '' COMMENT '支付名称'",
+        code = "varchar(128) DEFAULT '' COMMENT 'SDK支付方回调错误码'",
+        uid = "int(11) NOT NULL COMMENT '用户id'",
+        orderNo = "varchar(64) DEFAULT '' COMMENT '订单号'",
+        diamond = "int(11) DEFAULT '0' COMMENT '钻石'",
+        gold = "bigint(20) DEFAULT '0' COMMENT '金币'",
+        gid = "int(10) DEFAULT NULL COMMENT '商品ID'",
+        amount = "decimal(5,2) DEFAULT NULL COMMENT '订单金额,单位分'", -- 入库单位元
+        time = "varchar(32) DEFAULT NULL COMMENT '订单时间'",
+        createtime = "varchar(50) DEFAULT NULL COMMENT '支付服处理时间'",
+        status = "tinyint(1) DEFAULT NULL COMMENT '订单状态:0手动发放订单,1游戏逻辑自动发放订单'",
+        resMsg = "varchar(255) DEFAULT NULL COMMENT '注释'",
+        channel = "int(11) DEFAULT 0 COMMENT '渠道'",
+        type = "int(11) DEFAULT 0 COMMENT '支付类型'",
+        readStatus = "int(11) DEFAULT 0 COMMENT '状态:1客户端是否已经被轮询获取'",
+        cut = "tinyint(1) DEFAULT 0 COMMENT '状态: 1 订单扣除'",
+        gameStatus = "tinyint(1) DEFAULT 0 COMMENT '游戏服处理:0未处理,1处理'"
+    }
+end
+
+return root

dev/modules/pay.lua

@@ -0,0 +1,69 @@
+--[[
+Descripttion:支付订单模块
+version:
+Author: Neo,Huang
+Date: 2022-08-17 16:04:20
+LastEditors: Neo,Huang
+LastEditTime: 2022-09-05 10:05:30
+--]]
+local shopAdapt = require("adapt.shopAdapt")
+
+local payData = require("data.pay")
+local bagData = require("data.bag")
+
+local root = class("modulePay", require("base.baseModule"))
+
+function root:ctor(uid)
+    root.super.ctor(self, "pay", "uid", true)
+    self.uid = uid
+end
+
+function root:mysql_get_init_columns()
+    return {
+        uid = "int(11) NOT NULL COMMENT '用户id'",
+        totalAmount = "int(10) DEFAULT NULL COMMENT '总支付金额（单位分）'",
+        goodsList = "JSON COMMENT '支付商品信息列表'",
+        dayInfo = "JSON COMMENT '当天支付商品信息'",
+        goodsPreCustomItems = "JSON COMMENT '定制商品信息列表'",
+        goodsPayCustomItems = "JSON COMMENT '定制商品信息列表'"
+    }
+end
+
+-- 发放商品物品
+function root:dispatch_goods_items(role, gid)
+    local uid = self.uid
+    local conf = gid and shopAdapt:goods_get_info(gid)
+    if not conf then
+        return code.PARAMTER_ERROR
+    end
+    -- 获取物品
+    local eventId = string.format("shop-pay-%s", tostring(gid))
+    local items = payData:get_goods_pre_custom_items(uid, gid) or conf.items
+    bagData:add_items(uid, items, eventId)
+    -- 定制信息
+    if payData:del_goods_pre_custom_items(uid, gid) then
+        payData:update_goods_pay_custom_items(uid, gid, items)
+    end
+
+    -- 通知前端 - 商品发货
+    local pack = {goodsId = gid, items = items}
+    util_user:user_proto_notify(uid, "on_shop_buy_goods", pack)
+    -- 事件
+    local evtParams = {
+        times = 1,
+        gid = gid
+    }
+    evtParams.isFirstPay = payData:is_first_pay(uid)
+    evtParams.isGoodsFirstPay = payData:is_goods_first_pay(uid, gid)
+    if not is_empty(conf.rmb) then
+        payData:user_add_pay(uid, gid, conf.rmb)
+
+        evtParams.amount = conf.rmb
+        evtParams.totalAmount = self:redis_get_key_info("totalAmount")
+    end
+    util_user:user_dispatch_event(uid, gameConst.EVENT_ID.PAY, evtParams)
+
+    return code.OK, {items = items}
+end
+
+return root

dev/utils/util_order.lua

@@ -20,7 +20,7 @@ function root:add_order(orderAction)
     end
     local sql =
         string.format(
-        "INSERT INTO `tb_order` (`pay`,`orderNo`,`uid`,`diamond`,`gold`,`itemId`,`amount`,`time`,`status`,`resMsg`," ..
+        "INSERT INTO `mdl_order` (`pay`,`orderNo`,`uid`,`diamond`,`gold`,`itemId`,`amount`,`time`,`status`,`resMsg`," ..
             "`channel`,`type`,`createtime`,`cut`) VALUES ('%s','%s',%d,%s,%s,%d,%s,%d,%d,'%s',%d,%d,'%s',%d); ",
         orderAction.pay or "",
         orderAction.orderNo or "",
@@ -40,21 +40,28 @@ function root:add_order(orderAction)
 
     return mysqlUtil:insert(sql)
 end
+-- 打包订单信息
+function root:pack_order_info(orderAction)
+    if orderAction == nil then
+        return
+    end
+    return {
+        status = orderAction.status,
+        orderId = orderAction.orderNo,
+        gid = orderAction.itemId,
+        errMsg = orderAction.resMsg,
+        payName = orderAction.pay,
+        errCode = orderAction.code,
+        amount = orderAction.amount
+    }
+end
 -- 通知
 function root:on_shop_order(orderAction)
     if orderAction == nil or orderAction.status ~= 1 then
         return false
     end
     local msg = {
-        orderInfo = {
-            status = orderAction.status,
-            orderId = orderAction.orderNo,
-            gid = orderAction.itemId,
-            errMsg = orderAction.resMsg,
-            payName = orderAction.pay,
-            errCode = orderAction.code,
-            amount = orderAction.amount
-        }
+        orderInfo = self:pack_order_info(orderAction)
     }
     util_user:user_proto_notify(orderAction.uid, "on_shop_order", msg)
     return true
@@ -64,7 +71,7 @@ function root:is_order_exist(orderId)
     if is_empty(orderId) then
         return false
     end
-    local sql = string.format("SELECT 1 FROM `tb_order` WHERE orderNo = '%s';", orderId)
+    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
@@ -76,7 +83,7 @@ end
 function root:get_order_id(orderId, uid)
     local sql =
         string.format(
-        "SELECT id FROM `tb_order` WHERE orderNo = '%s' and uid = %d ORDER BY id DESC LIMIT 1 ;",
+        "SELECT id FROM `mdl_order` WHERE orderNo = '%s' and uid = %d ORDER BY id DESC LIMIT 1 ;",
         orderId or "",
         uid or 0
     )
@@ -91,12 +98,13 @@ function root:update_order_status(id, status)
     if id == nil or status == nil then
         return false
     end
-    local sql = string.format("UPDATE `tb_order` SET `gameStatus` = %s where `id` = %s", tostring(status), tostring(id))
+    local sql =
+        string.format("UPDATE `mdl_order` SET `gameStatus` = %s where `id` = %s", tostring(status), tostring(id))
     return mysqlUtil:update(sql)
 end
 -- 获取未处理订单列表
 function root:get_unhandle_order_list()
-    local sql = string.format("SELECT * FROM `tb_order` WHERE `gameStatus`=0 AND `status`=1 ORDER BY id DESC")
+    local sql = string.format("SELECT * FROM `mdl_order` WHERE `gameStatus`=0 AND `status`=1 ORDER BY id DESC")
     local ok, ret = mysqlUtil:select(sql)
     if not ok or is_empty(ret) then
         return
@@ -110,7 +118,7 @@ function root:handle_invalid_order(orderAction)
     -- 标记为已经处理并更新到数据库
     local sql =
         string.format(
-        "UPDATE `tb_order` SET `gameStatus` = 1,`status`=%s,`resMsg`='%s' where `id` = %s",
+        "UPDATE `mdl_order` SET `gameStatus` = 1,`status`=%s,`resMsg`='%s' where `id` = %s",
         tostring(orderAction.status),
         tostring(orderAction.resMsg),
         tostring(orderAction.id)

nodes/game/interface/shop.lua

@@ -0,0 +1,174 @@
+-- 商城接口
+local code = require "code"
+local util_user = require("utils.util_user")
+local lib_game_mysql = require("lib_game_mysql")
+local util_order = require("utils.util_order")
+
+local shopAdapt = require("adapt.shopAdapt")
+
+local dataBag = require("data.bag")
+
+local root = {}
+
+-- 购买商品
+function root.shop_buy_goods(role, msg)
+    local gid = msg.goodsId
+    local conf = shopAdapt:goods_get_info(gid)
+    if conf == nil or conf.price == nil then
+        return code.PARAMTER_ERROR
+    end
+    local uid = role.uid
+    local ok = dataBag:is_enough(uid, conf.price)
+    if not ok then
+        return code.RES.NOT_ENOUGH
+    end
+    local eventId = "shop-pay-" .. tostring(gid)
+    dataBag:consume_items(uid, conf.price, eventId)
+
+    return role.pay:dispatch_goods_items(role, gid)
+end
+
+-- 充值成功回调
+function root.on_pay(role, msg)
+    local uid = role.uid
+    log.print("充值成功回调 %s, %s", uid, tostring(msg))
+    local order = msg.orderAction
+    local logEvent = function(seasonId)
+        local extraParams =
+            table.concat(
+            {
+                order and order.orderNo or "",
+                order and order.type or "",
+                order and order.itemId or "",
+                order and order.amount or "",
+                order and order.status or "",
+                seasonId or ""
+            },
+            ","
+        )
+        util_user:log_event(uid, "OrderError", extraParams)
+    end
+    local gid = msg.goodsId
+    local conf = goodsId and shopAdapt:goods_get_info(gid)
+    if is_empty(conf) then
+        log.error("商城充值回调 gid =%s", gid)
+        logEvent(1)
+        return code.PARAMTER_ERROR
+    end
+    -- 订单先完成
+    util_order:update_order_status(order and order.id, 1)
+
+    -- 统计 - 充值金额
+    local amount = math.floor(tonumber(msg.orderAction.amount) * 100)
+
+    -- 增加物品
+    local errCode, res = role.pay:dispatch_goods_items(role, gid, amount)
+    if code.is_not_ok(errCode) then
+        return errCode
+    end
+
+    -- 推送客户端
+    util_order:on_shop_order(order)
+
+    return code.OK, res
+end
+
+-- 1.5版本订单BUG，修复代码
+local function is_order(str)
+    if str == nil or #str == 0 then
+        return false
+    end
+
+    for i = 1, #str do
+        local cur_byte = string.byte(str, i)
+        if cur_byte > 127 then
+            return false
+        end
+    end
+    return true
+end
+-- 查询订单结果
+function root.shop_get_order(role, msg)
+    if msg == nil or msg.orderId == nil then
+        return code.PARAMTER_ERROR
+    end
+    local uid = role.uid
+    local orderId = msg.orderId
+
+    log.info("itf_get_order uid[%s] orderId[%s]", uid, orderId)
+    if not is_order(orderId) then
+        return code.SHOP.ALREADY_GET_ORDER
+    end
+
+    -- 订单是否已入库
+    local sql =
+        string.format(
+        "SELECT `id`, `gid`, `status`, `resMsg`, `pay`, `amount` FROM `mdl_order` WHERE orderNo='%s';",
+        orderId
+    )
+    local ret = lib_game_mysql:query(sql)
+    if is_empty(ret) then
+        return code.SHOP.NO_FOUND_ORDER
+    end
+    -- 修改订单状态
+    sql = string.format("UPDATE `mdl_order` SET `readStatus`=99 WHERE `orderNo`='%s';", orderId)
+    lib_game_mysql:query(sql)
+
+    local id = tonumber(ret[1].id)
+    local status = tonumber(ret[1].status)
+    local goodsId = tonumber(ret[1].gid)
+    local resMsg = ret[1].resMsg
+    local payName = ret[1].pay
+    local amount = ret[1].amount
+    local order = {
+        status = status,
+        goodsId = goodsId,
+        orderId = orderId,
+        errMsg = resMsg,
+        payName = payName,
+        amount = tostring(amount)
+    }
+    if status ~= 1 then
+        -- 订单支付失败
+        return code.OK, {order = order}
+    end
+
+    local logEvent = function(seasonId)
+        local extraParams =
+            table.concat(
+            {
+                orderId,
+                payName,
+                goodsId,
+                amount,
+                status,
+                seasonId or ""
+            },
+            ","
+        )
+        util_user:log_event(uid, "OrderError", extraParams)
+    end
+
+    local conf = goodsId and shopAdapt:goods_get_info(goodsId)
+    if is_empty(conf) then
+        log.error("商城充值回调 goodsId =%s", goodsId)
+        logEvent(1)
+        return code.PARAMTER_ERROR
+    end
+    -- TODO 订单回调是否重复
+    -- 订单先完成
+    util_order:update_order_status(id, 1)
+    -- 增加物品
+    local errCode, res = role.pay:dispatch_goods_items(role, goodsId)
+    if errCode ~= code.OK then
+        return errCode
+    end
+
+    -- 推送客户端
+    util_order:on_shop_order(order)
+
+    local ret = {orderInfo = util_order:pack_order_info(order)}
+    return code.OK, ret
+end
+
+return root

nodes/game/interface/test.lua

@@ -0,0 +1,118 @@
+-- 测试工具
+local code = require "code"
+local gameConst = require("const.gameConst")
+local timeUtil = require "utils.timeUtil"
+local honorAdapt = require("adapt.honorAdapt")
+local redisUtil = require "utils.redisUtil"
+local whiteAdapt = require "adapt.whiteAdapt"
+local nodeMgr = require "nodeMgr"
+local util_user = require("utils.util_user")
+local util_order = require("utils.util_order")
+
+local moduleData = require("data.module")
+local bagData = require("data.bag")
+
+local root = {}
+-- if not IS_TEST then return end
+
+-- 调试系统时间
+function root.test_debug_system_time(role, msg)
+    if not IS_TEST then
+        return code.UNKNOWN
+    end
+    local uid = msg.uid
+    if not uid then
+        return code.PARAMTER_ERROR
+    end
+
+    local time, reset = msg.time, msg.reset or 0
+    if reset == 0 then
+        moduleData:hset(uid, "user", "time:sys")
+        moduleData:hset(uid, "user", "time:logout")
+    elseif reset == 1 then
+        -- 间隔时间
+        local deltaTime = time - skynet_time()
+        moduleData:hset(uid, "user", "time:sys", deltaTime)
+    elseif reset == 2 then
+        moduleData:hset(uid, "user", "registerTime", time)
+    elseif reset == 3 then
+        local deltaTime = time - skynet_time()
+        moduleData:hset(uid, "user", "time:logout", deltaTime)
+    end
+
+    local ret = {}
+    ret.sysTime = timeUtil.now(uid)
+    ret.debugTime = moduleData:hget_int(uid, "user", "time:sys")
+    return code.OK, ret
+end
+
+function root.test_add_items(role, msg)
+    local uid = role.uid
+    local items = msg.items
+    if not items then
+        return code.PARAMTER_ERROR
+    end
+    for k, v in ipairs(items) do
+        v.force = true
+    end
+    bagData:add_items(uid, items, "gmset")
+    return code.OK, {}
+end
+
+function root.test_pay_goods(role, msg)
+    local orderId = msg.orderId
+    local payName = msg.payName
+    local status = msg.status
+    local resMsg = msg.resMsg
+    local amount = msg.amount / 100.0
+
+    local errCode = 1
+    if not msg.status then
+        errCode = 0
+    end
+    local data = string.split(orderId, "_")
+    local channel, uid, gid = tonumber(data[2]), tonumber(data[3]), tonumber(data[4])
+    log.print("orderId:%s uid:%s channel:%s gid:%s", orderId, uid, channel, gid)
+    local pack = {
+        ["code"] = errCode,
+        ["orderNo"] = msg.orderId,
+        ["orderAction"] = {
+            ["type"] = 0,
+            ["code"] = "TRADE_FINISHED",
+            ["id"] = 0,
+            ["cut"] = 0,
+            ["createtime"] = "",
+            ["uid"] = uid,
+            ["itemId"] = gid,
+            ["amount"] = amount,
+            ["time"] = tostring(timeUtil.now(role.uid)),
+            ["channel"] = channel,
+            ["status"] = errCode,
+            ["orderNo"] = msg.orderId,
+            ["pay"] = "test_pay_goods",
+            ["resMsg"] = "TRADE_FINISHED",
+            ["tradeNo"] = msg.orderId
+        },
+        ["goodsId"] = gid,
+        ["name"] = "test_pay_goods",
+        ["channel"] = channel,
+        ["cmd"] = "test_pay_goods",
+        ["uid"] = uid,
+        ["pp"] = "shop",
+        ["gid"] = gid
+    }
+    pack.amount = amount
+    -- 测试订单入库
+    util_order:add_order(pack.orderAction)
+    util_order:on_shop_order(pack.orderAction)
+    pack.orderAction.id = util_order:get_order_id(pack.orderAction.orderNo, pack.orderAction.uid)
+    if errCode ~= 1 then
+        return code.OK
+    end
+
+    -- 发送物品
+    local shopInterface = require "interface.shop"
+    return shopInterface.on_pay(role, pack)
+end
+
+return root

nodes/game/lib/role.lua

@@ -19,7 +19,7 @@ function root:ctor(uid, gSession)
         assert(self[cname] == nil)
 
         local moduleObj = moduleClass.new(uid)
-        if not moduleObj.noPersonal then
+        if moduleObj.isPersonal then
             self[cname] = moduleObj
             table.insert(self.moduleList, cname)
         end

nodes/global/lib/backupRole.lua

@@ -24,7 +24,7 @@ function root:ctor(uid)
         assert(self[cname] == nil)
 
         local moduleObj = moduleClass.new(uid)
-        if not moduleObj.noPersonal then
+        if moduleObj.isPersonal then
             self[cname] = moduleObj
             table.insert(self.moduleList, cname)
         end