添加订单表，全局id定时回写数据库

liuzujun
1 parent 52249374
Showing 9 changed files with 130 additions and 40 deletions Show diff stats
src/GlobalVar.lua
src/actions/HttpAction.lua
src/actions/StoreAction.lua
src/models/Order.lua
src/models/RolePlugin.lua
src/services/dbseed.lua
src/services/globald.lua
src/shared/ModelBaseMysql.lua
src/utils/MysqlUtil.lua
@@ -20,6 +20,7 @@ STRUCT_VERSION = 3 -- 数据结构版本
 IOS_SID = 4 -- 判断是不是ios设备
+MAX_SVR_ID = 10000
 MAX_ROLE_NUM = 1000000
 MAX_HERO_NUM = 1000000 -- 英雄的id = roleId * MAX_HERO_NUM + index
 MAX_RUNE_NUM = 1000000 -- 铭文的id = roleId * MAX_RUNE_NUM + index
@@ -147,6 +147,36 @@ function _M.gm_action(query)
 	return status
 end
+function _M.pay_action(query)
+	local gmFuncs = require "actions.GmAction"
+	if not query.cmd or not query.order or not gmFuncs[query.cmd] then return "指令不存在" end
+	local mysqlproxy = require "shared.mysqlproxy"
+	local res = mysqlproxy:query(string.format("SELECT roleid FROM `Order` WHERE `id` = %s", query.order))
+	if res[1] then 
+		query.id = res[1]["roleid"]
+	else
+		return "订单非法"
+	end
+	-- 在线操作
+	query.id = tonumber(query.id)
+	local isOn = proc_online(query.cmd, query.id, query)
+	if isOn ~= "not_online" then
+		return isOn
+	end
+	-- 离线操作
+	local role = require("models.Role").new({key = string.format("%d", query.id)})
+	local ret = role:load()
+	if not ret then
+		return "角色不存在"
+	end
+	role:loadAll()
+	role:startActionUcode()
+	local status = gmFuncs[query.cmd](role, query)
+	role:endActionUcode()
+	
+	return status
+end
+
 function _M.query_role(query)
 	if not query.uid then return "not found" end
 	local user = redisproxy:get(string.format("uid:%s", query.uid))
@@ -18,7 +18,6 @@ function _M.rechargeRpc(agent , data)
 	end
 	SendPacket(actionCodes.Store_rechargeRpc, MsgPack.pack({ order = partnerOrderId }))
-
 	-- 测试的 直接发奖励了
 	skynet.timeout(10, function ()
 		role:handlePurchase({
-local Order = class("Order", require("shared.ModelBase"))
+local Order = class("Order", require("shared.ModelBaseMysql"))
 function Order:ctor(properties)
-	Order.super.ctor(self, properties)
+    Order.super.ctor(self, properties)
 end
 Order.schema = {
-    key     	= {"string"},       -- redis key
-    order 		= {"string"},      	-- 自己订单号
+	id 			= {"number", 0, "pri"}, -- 自己的订单号
+	roleid 		= {"number", 0, "index"},
+    --order 		= {"string"},      	-- 自己订单号
     rechargeId  = {"number", 0},
     transactionId = {"string", ""},
     createTime  = {"number", skynet.timex()},       -- 订单创建时间
@@ -1740,24 +1740,27 @@ function RolePlugin.bind(Role)
 			if not self.activity:isOpenById(rechargeData.activity_id, "ActShopGoods") then return "" end
 		end
-	    local orderId = redisproxy:hget(string.format(R_ORDERS, roleId), rechargeId)
-	    if orderId then
-	    	local orderObject = require("models.Order").new({ key = string.format(R_ORDER, roleId, orderId) })
+		local orderId = redisproxy:hget(string.format(R_ORDERS, roleId), rechargeId)
+		if orderId then
+			local uid = orderId * MAX_SVR_ID + serverId
+			local orderObject = require("models.Order").new({ key = string.format("%d", uid), id = uid })
 			if orderObject:load() and orderObject:getProperty("rechargeId") == rechargeId and math.abs(skynet.timex() - orderObject:getProperty("createTime")) < 5 * 60 then
-				return string.format("%d_%d_%d", serverId, roleId, orderId)
+				return string.format("%d", uid)
 			end
-	    end
+		end
 		orderId = redisproxy:hincrby("autoincrement_set", "order", 1)
-		local partnerOrderId = string.format("%d_%d_%d", serverId, roleId, orderId)
+		local uid = orderId * MAX_SVR_ID + serverId
+		local partnerOrderId = string.format("%d", orderId * MAX_SVR_ID + serverId)
 		local orderKey = string.format(R_ORDER, roleId, orderId)
 		redisproxy:del(orderKey) -- 删掉可能有了
 		local order = require("models.Order").new({ 
-			key = orderKey, 
-			order = partnerOrderId, 
+			key = partnerOrderId, 
+			id = tonum(partnerOrderId), 
 			rechargeId = rechargeId, 
 			createTime = skynet.timex(),
 			transactionId = transactionId,
+			roleid = roleId,
 			sid = self:getProperty("sid"),
 		})
 		order:create()
@@ -1779,10 +1782,8 @@ function RolePlugin.bind(Role)
 	--]]
 	function Role:updatePurchaseOrder(partnerOrderStr, platformOrder, status)
 		if not partnerOrderStr then return false end
-		local _, _, orderId = string.match(partnerOrderStr, "(.+)_(.+)_(.+)")
-
 		local roleId = self:getProperty("id")
-		local orderObject = require("models.Order").new({ key = string.format(R_ORDER, roleId, orderId) })
+		local orderObject = require("models.Order").new({ key = string.format("%d", partnerOrderStr), id = tonum(partnerOrderStr)})
 		if not orderObject:load() then
 			return false
 		end
@@ -1791,6 +1792,14 @@ function RolePlugin.bind(Role)
 		local dataSet = csvdb["shop_rechargeCsv"][rechargeId]
 		local sid = orderObject:getProperty("sid")
+		if roleId ~= orderObject:getProperty("roleid") then
+			skynet.error(string.format("[recharge] with a different role id,  current roleId:%d, order role Id:%d, order cpOrder: %s, platformOrder : %s, hadPlatformOrder: %s, id: %s, overTime : %s", 
+				roleId, orderObject:getProperty("roleid"),
+				partnerOrderStr, platformOrder, orderObject:getProperty("transactionId"), rechargeId, orderObject:getProperty("finishTime")
+			))
+			return false, "unknow"
+		end
+
 		if orderObject:getProperty("finishTime") > 0 then
 			skynet.error(string.format("[recharge] is a finish order cpOrder: %s, platformOrder : %s, hadPlatformOrder: %s, id: %s, overTime : %s", 
 				partnerOrderStr, platformOrder, orderObject:getProperty("transactionId"), rechargeId, orderObject:getProperty("finishTime")
@@ -4,6 +4,7 @@ require &quot;GlobalVar&quot;
 require "RedisKeys"
 require "ProtocolCode"
 require "skynet.manager"
+require "utils.MysqlUtil"
 skynet = require "skynet"
@@ -12,19 +13,31 @@ mysqlproxy = require &quot;shared.mysqlproxy&quot;
 SendPacket = function ( ... ) end
+
 local function initRedisDb( ... )
-	local servId = tonumber(skynet.getenv("servId"))
-	if servId then
-		redisproxy:hsetnx("autoincrement_set", "role", servId * MAX_ROLE_NUM)
-		redisproxy:hsetnx("autoincrement_set", "union", servId * MAX_ROLE_NUM)
-		redisproxy:hsetnx("autoincrement_set", "trade", servId * MAX_ROLE_NUM * 100)
-		redisproxy:hsetnx("autoincrement_set", "email", 0)
-		redisproxy:hsetnx("autoincrement_set", "emailTimestamp", 0)
-		redisproxy:hsetnx("autoincrement_set", "delay_email", 0)
-		redisproxy:hsetnx("adv_season", "idx", 0)
-		redisproxy:hsetnx("adv_season", "chapter", globalCsv.adv_endless_default_chapter)
-		redisproxy:hsetnx("adv_season", "overTime", 0)
+	local function initAutoIncrementUid(tbName, keyName, fieldName)
+		if not fieldName then fieldName = "value" end
+		local mysqlVal = getDbCfgVal(tbName, keyName, fieldName)
+		if not mysqlVal then 
+			skynet.error(string.format("get db cfg fail, table %s, key %s, field %s", tbName, keyName, fieldName))
+			return
+		end
+		local redisVal = tonum(redisproxy:hget(tbName, keyName))
+		if redisVal < mysqlVal then
+			redisproxy:hset(tbName, keyName, mysqlVal)
+		end
 	end
+
+	initAutoIncrementUid("autoincrement_set", "role")
+	initAutoIncrementUid("autoincrement_set", "union")
+	initAutoIncrementUid("autoincrement_set", "order")
+	initAutoIncrementUid("autoincrement_set", "email")
+	initAutoIncrementUid("autoincrement_set", "emailTimestamp")
+	initAutoIncrementUid("autoincrement_set", "delay_email")
+
+	--redisproxy:hsetnx("adv_season", "idx", 0)
+	--redisproxy:hsetnx("adv_season", "chapter", globalCsv.adv_endless_default_chapter)
+	--redisproxy:hsetnx("adv_season", "overTime", 0)
 end
 -- 初始化服务器数据库以及服务器信息表
@@ -52,7 +65,7 @@ end
 local function initAutoIncreUidTable()
 	mysqlproxy:query [[
-		CREATE TABLE IF NOT EXISTS `auto_increment_uid` (
+		CREATE TABLE IF NOT EXISTS `autoincrement_set` (
 			`key` varchar(45) NOT NULL,
 			`value` int(11) DEFAULT NULL,
 			PRIMARY KEY (`key`)
@@ -60,10 +73,10 @@ local function initAutoIncreUidTable()
 	]]
 	local servId = tonumber(skynet.getenv("servId"))
 	if servId then
-		local tpl = "INSERT INTO `auto_increment_uid`(`key`, `value`) values('%s', %d)"
+		local tpl = "INSERT INTO `autoincrement_set`(`key`, `value`) values('%s', %d)"
 		mysqlproxy:query(string.format(tpl, "role", servId * MAX_ROLE_NUM))
 		mysqlproxy:query(string.format(tpl, "union", servId * MAX_ROLE_NUM))
-		mysqlproxy:query(string.format(tpl, "trade", servId * MAX_ROLE_NUM * 100))
+		mysqlproxy:query(string.format(tpl, "order", 0))
 		mysqlproxy:query(string.format(tpl, "email", 0))
 		mysqlproxy:query(string.format(tpl, "emailTimestamp", 0))
 		mysqlproxy:query(string.format(tpl, "delay_email", 0))
@@ -89,7 +102,7 @@ local function initAdvSeasonTable()
 end
 local function checkRoleTables()
-	local list = {"Role", "Daily", "Activity", "Diner", "Store", "Hero", "RoleIncre", "Rune"}
+	local list = {"Role", "Daily", "Activity", "Diner", "Store", "Hero", "RoleIncre", "Rune", "Order"}
 	for _, name in ipairs(list) do
 		local obj = require("models."..name).new({key = "key"})
 		print("check table [" .. name .. "] begin.")
@@ -100,22 +113,18 @@ end
 local steps = {
 	[1] = {
-		handler = initRedisDb,
-		desc = "initialize redis database "
-	},
-	[2] = {
 		handler = initServerDatabase,
 		desc = "initialize server database "
 	},
-	[3] = {
+	[2] = {
 		handler = initAutoIncreUidTable,
 		desc = "initialize auto_increment_uid table "
 	},
-	[4] = {
+	[3] = {
 		handler = initAdvSeasonTable,
 		desc = "initialize adv_season table "
 	},
-	[5] = {
+	[4] = {
 		handler = checkRoleTables,
 		desc = "check role tables "
 	}
@@ -136,5 +145,6 @@ skynet.start(function ()
 		action.handler()
 		print(action.desc .. "finished ...")
 	end
+	initRedisDb()
 	skynet.exit()
 end)
 \ No newline at end of file
@@ -8,6 +8,7 @@ require &quot;utils.init&quot;
 require "RedisKeys"
 require "skynet.manager"
 require "GlobalVar"
+require "utils.MysqlUtil"
 local ipairs = ipairs
@@ -18,6 +19,7 @@ local string_format = string.format
 local CHECK_MAIL_STATUS_INTERVAL 	= 100 * 60
 local CHECK_BATTLE_ACT_CLOSE_INTERVAL = 100 * 1
+local SAVE_AUTOINCREMENT_SET_INTERVAL = 100 * 2
 local function mailQuene()
 	local delayEmail = tonum(redisproxy:hget("autoincrement_set", "delay_email"))
 	if delayEmail == 0 then
@@ -153,7 +155,25 @@ local function check_battle_act_close()
 	skynet.timeout(CHECK_BATTLE_ACT_CLOSE_INTERVAL, check_battle_act_close)
 end
+local function save_autoincrement_timer()
+	local function saveUidToMysql(tbName, keyName, fieldName)
+		if not fieldName then fieldName = "value" end
+		local mysqlVal = getDbCfgVal(tbName, keyName, fieldName) or 0
+		local redisVal = tonum(redisproxy:hget(tbName, keyName))
+		if redisVal > mysqlVal then
+			setDbCfgVal(tbName, keyName, fieldName, redisVal)
+		end
+	end
+	saveUidToMysql("autoincrement_set", "role")
+	saveUidToMysql("autoincrement_set", "union")
+	saveUidToMysql("autoincrement_set", "order")
+	saveUidToMysql("autoincrement_set", "email")
+	saveUidToMysql("autoincrement_set", "emailTimestamp")
+	saveUidToMysql("autoincrement_set", "delay_email")
+
+	skynet.timeout(SAVE_AUTOINCREMENT_SET_INTERVAL, save_autoincrement_timer)
+end
 local CMD = {}
@@ -178,6 +198,7 @@ end
 function CMD.start()
 	check_mail_queue()
 	--check_battle_act_close()
+	save_autoincrement_timer()
 end
 local function __init__()
@@ -67,7 +67,7 @@ function ModelBaseMysql:load(properties)
     end
     local load = false
     if not properties then
-        properties = mysqlproxy:query(string_format("SELECT * from %s where `%s` = %s;", self.class.__cname, self.pri_key, self:getKey()))
+        properties = mysqlproxy:query(string_format("SELECT * from `%s` where `%s` = %s;", self.class.__cname, self.pri_key, self:getKey()))
         load = true
     end
     if not next(properties) then return false end
@@ -115,7 +115,7 @@ function ModelBaseMysql:save()
     end
     if next(params) then
         -- insert update
-        local sql = "INSERT INTO %s (%s) VALUES (%s) ON DUPLICATE KEY UPDATE %s;"
+        local sql = "INSERT INTO `%s` (%s) VALUES (%s) ON DUPLICATE KEY UPDATE %s;"
         local tbName = self.class.__cname
         local key_list = ""
         local value_list = ""
@@ -0,0 +1,19 @@
+local skynet = require "skynet"
+local mysqlproxy = require "shared.mysqlproxy"
+
+
+function getDbCfgVal(tbName, keyName, fieldName)
+    local sql = string.format("SELECT * FROM `%s` WHERE `key` = '%s';", tbName, keyName)
+    local res = mysqlproxy:query(sql)
+    if not next(res) or res.errno then
+        return
+    end
+
+    return res[1][fieldName]
+end
+
+function setDbCfgVal(tbName, keyName, fieldName, fieldVal)
+    if type(fieldVal) == "string" then fieldVal = string.format("'%s'", fieldVal) end
+    local sql = string.format("UPDATE `%s` SET `%s` = %s WHERE `key` = '%s';", tbName, fieldName, fieldVal, keyName)
+    mysqlproxy:query(sql)
+end
 \ No newline at end of file