Merge branch 'bugfix' into tr/qa

熊润斐
2 parents da3aa52f 648d9726
Showing 13 changed files with 176 additions and 106 deletions Show diff stats
src/GlobalVar.lua
src/RedisKeys.lua
src/actions/ActivityAction.lua
src/actions/HeroAction.lua
src/actions/StoreAction.lua
src/csvdata
src/models/Activity.lua
src/models/Role.lua
src/models/RoleCross.lua
src/models/RolePlugin.lua
src/models/RoleTimeReset.lua
src/models/Store.lua
src/utils/CommonFunc.lua
@@ -315,6 +315,7 @@ TriggerEventType = {
 	LevelUp = 4,
 	AddNewHero = 5,
 	SSRCount = 6,
+	AfterTs = 7, 	-- 某时间以后
 }
 DrawCardType = {
@@ -12,6 +12,8 @@ R_RUNE = &quot;role:%d:rune:%d&quot;       -- 符文详细信息
 R_EMAIL = "role:%d:emailIds" --邮件列表
 R_EMAIL_ITEM = "email:%d:%d" --邮件
 R_STORE = "role:%d:store"   -- 商店
+R_ORDERS = "role:%d:orders" -- 订单
+R_ORDER = "order:%d:%d"
 -- rank
@@ -195,6 +195,7 @@ function _M.actPaySignRpc(agent, data)
 	local diffDay = diffFromTs(ts) + 1
 	local curData = role.activity:getActData("PaySignIn")
+	if not curData then return 3 end
 	local reward, change = {}
 	for day, csvData in ipairs(csvdb["pay_signInCsv"]) do
 		if day <= diffDay and day == dayIndex then
@@ -738,7 +738,7 @@ function _M.drawHeroRpc(agent, data)
 	if btype == 1 then
 		-- 判断定向卡池活动开启
-		if not role.activity:isOpen("SsrUpPoolChange") then
+		if not role.activity:isOpen("RaceDraw") then
 			return
 		end
 	end
@@ -982,8 +982,9 @@ function _M.drawHeroRpc(agent, data)
 			--end
 			SendPacket(actionCodes.Hero_drawHeroExtraRewardNtf, MsgPack.pack(role:packReward(r, change)))
 		elseif drawCardReward and drawCardReward ~= "" then
-			role:award(drawCardReward, {log = {desc = "drawHeroExtraReward", int1 = oldVal, int2 = newVal}})
-			SendPacket(actionCodes.Hero_drawHeroExtraRewardNtf, MsgPack.pack({reward = drawCardReward:toNumMap()}))
+			local r,change = {}
+			r, change = role:award(drawCardReward, {log = {desc = "drawHeroExtraReward", int1 = oldVal, int2 = newVal}})
+			SendPacket(actionCodes.Hero_drawHeroExtraRewardNtf, MsgPack.pack(role:packReward(r, change)))
 		end
 		role:updateProperty({field = "repayHero", value = val})
 	end
 local _M = {}
-local serverId = tonumber(skynet.getenv("servId"))
 local md5 = require "md5"
-local function makeOrder(roleId, rechargeId)
-	local orderId = redisproxy:hincrby("autoincrement_set", "order", 1)
-	local partnerOrderId = string.format("%d_%d_%d", serverId, roleId, orderId)
-	local orderKey = string.format("order:%d:%d", roleId, orderId)
-	redisproxy:del(orderKey)
-	local order = require("models.Order").new({ 
-		key = orderKey, 
-		order = partnerOrderId, 
-		rechargeId = rechargeId, 
-	})
-	order:create()
-	redisproxy:sadd(string.format("role:%d:orders", roleId), partnerOrderId)
-	return partnerOrderId
-end
-
 -- 入口在正式服关闭  -- mock 充值
 function _M.rechargeRpc(agent , data)
 	local role = agent.role
@@ -28,7 +12,7 @@ function _M.rechargeRpc(agent , data)
 	local roleId = role:getProperty("id")
 	--创建订单号
-	local partnerOrderId = makeOrder(roleId, id)
+	local partnerOrderId = role:getPurchaseOrder(id)
 	SendPacket(actionCodes.Store_rechargeRpc, MsgPack.pack({ order = partnerOrderId }))
@@ -77,7 +61,7 @@ function _M.googleRechargeRpc(agent, data)
 	role.ignoreHeartbeat = true
 	--创建订单号
-	local partnerOrderId = makeOrder(roleId, id)
+	local partnerOrderId = role:getPurchaseOrder(id)
 	-- 签名
 	local secret_key = "b7657fa7ccd44c16a35e3f454ac7a075"
 	local need = {
@@ -104,7 +88,7 @@ function _M.myCardRechargeRpc(agent, data)
 	role.ignoreHeartbeat = true
 	--创建订单号
-	local partnerOrderId = makeOrder(roleId, id)
+	local partnerOrderId = role:getPurchaseOrder(id)
 	-- 签名
 	local secret_key = "48759e07540f46d9af17ec82669b4272"
 	local need = {
@@ -130,7 +114,7 @@ function _M.iosRechargeRpc(agent, data)
 	role.ignoreHeartbeat = true
 	--创建订单号
-	local partnerOrderId = makeOrder(roleId, id)
+	local partnerOrderId = role:getPurchaseOrder(id)
 	-- 签名
 	local secret_key = "9647d2efe1074c73b9ac19af4337a70e"
 	local need = {
@@ -154,43 +138,15 @@ function _M.purchaseOrderResult(agent, data)
 	role.ignoreHeartbeat = false
-	local partnerOrderStr = msg.order
-	local _, _, orderId = string.match(partnerOrderStr, "(.+)_(.+)_(.+)")
-	local orderObject = require("models.Order").new({ key = string.format("order:%d:%d", roleId, orderId) })
-	if not orderObject:load() then
-		-- 订单不存在
-		skynet.error("cancelPurchaseRpc", string.format("order %s not exist", partnerOrderStr))
-		return true
-	end
-
-	if msg.status == "success" then
-		orderObject:setProperty("transactionId", msg.platformOrder or "")
-		local rechargeId = orderObject:getProperty("rechargeId")
-		local dataSet = csvdb["shop_rechargeCsv"][rechargeId]
-		
-		role:log("setOrder", {
-			order_status = 100, -- "订单状态：100 - 开始下单（玩家还未开始付费行为记录）200 - 支付完成并发货（SDK通知可以发货时记录），300 - 订单被取消，1000 - 其他"
-			item_id = rechargeId, -- 道具id
-			item_type = dataSet.type, -- 购买的道具类型，具体见"onItems"方法中道具类型枚举表
-			item_name = dataSet.title, -- 购买的道具名
-			item_number = 1, -- 购买的道具数量
-			item_level = 1, -- 购买的道具等级
-			order_cost = dataSet.rmb * 100, -- 此次消费的现金金额（单位：分），如 51800即未518元，对应客户端SDK传入的'total_fee'
-			order_currency = "CNY", -- 货币类型，默认为"CNY"（人民币），遵循ISO 4217规范
-			order_type = role:getProperty("rmbC") > 0 and 0 or 1, -- 订单类型，首充记录为1，否则为0
-			order_id = msg.platformOrder, -- 本条记录的订单号,对应客户端SDK返回的'bs_trade_no'
-		})
-
-		return true
-	end
+	local status = {
+		fail = true,
+		success = true
+	}
-	if orderObject:getProperty("finishTime") > 0 then
-		return true
+	local partnerOrderStr = msg.order
+	if partnerOrderStr then
+		role:updatePurchaseOrder(partnerOrderStr, msg.platformOrder, status[msg.status] and msg.status or "unknown")
 	end
-
-	orderObject:setProperty("status", msg.status)
-
-	redisproxy:srem(string.format("role:%d:orders", roleId), partnerOrderStr)
 	return true
 end
-Subproject commit fa67cf8b44c11ad75a4d67525fc906d91e17655b
+Subproject commit 02a9bbbb10bb99a91cc5d67f62dc7e5b49d8cb46
@@ -18,7 +18,7 @@ Activity.ActivityType = {
 	DrawHero = 12,	--抽卡周 招募
 	AdvDraw = 13,	--拾荒抽周 资助
 	OpenBox = 14,	--拆解周 时钟箱
-	--RaceDraw = 15,  -- 定向招募活动
+	RaceDraw = 16,  -- 定向招募活动
 }
@@ -347,6 +347,15 @@ activityFunc[Activity.ActivityType.PaySignIn] = {
 	end,
 	["close"] = function(self, actType, notify)
 		self.owner.storeData:SetActGoodsFlag("paySignIn", 0)
+		
+		local rechargeRecord = self.owner.storeData:getProperty("payR")
+		for id, cfg in pairs(csvdb["shop_rechargeCsv"]) do
+			if cfg.shop == 2 and cfg.type == CardType.PaySignCard then
+				rechargeRecord[id] = nil
+				break
+			end
+		end
+		self.owner.storeData:updateProperty({field="payR", value=rechargeRecord})
 	end,
 }
@@ -112,6 +112,7 @@ Role.schema = {
 	hangBag				= {"table", {}},	-- 背包
 	hangBagLimit 		= {"number", globalCsv.idle_field_origin}, --背包上限
 	bTeam				= {"table", {}}, -- 奖励副本队伍
+	heroFormate			= {"table", {}},	-- 自选编队	 {adv={}, hang={}}
 	--引导相关
 	newerGuide 			= {"string","1=1"}, -- 新手引导 master=slave
@@ -287,7 +287,7 @@ end
 function CMD.friendBattleInfo(roleId)
 	local info = CMD.getProperties(roleId, {"pvpTBC", "hangTB"})
-	return next(info.pvpTBC) and info.pvpTBC or info.hangTB
+	return (next(info.pvpTBC) and next(info.pvpTBC.heros)) and info.pvpTBC or info.hangTB
 end
 function CMD.pvpCInfo(roleId)
-
+local serverId = tonumber(skynet.getenv("servId"))
 local RolePlugin = {}
 function RolePlugin.bind(Role)
@@ -1497,6 +1497,102 @@ function RolePlugin.bind(Role)
 		self:updateProperty({field = "redp", value = redp})
 	end
+	-- 获取充值订单号
+	function Role:getPurchaseOrder(rechargeId)
+		local roleId = self:getProperty("id")
+		local rechargeData = csvdb["shop_rechargeCsv"][rechargeId]
+		if not rechargeData then
+			skynet.error("recharge id not exist", rechargeId)
+			return ""
+		end
+		local limit = rechargeData.limit
+	    local rechargeRecord = self:getProperty("payR") or {}
+	    if limit ~= 0 and limit <= (rechargeRecord[rechargeId] or 0) then
+	        return ""
+	    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) })
+			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)
+			end
+	    end
+
+		orderId = redisproxy:hincrby("autoincrement_set", "order", 1)
+		local partnerOrderId = string.format("%d_%d_%d", serverId, roleId, orderId)
+		local orderKey = string.format(R_ORDER, roleId, orderId)
+		redisproxy:del(orderKey) -- 删掉可能有了
+		local order = require("models.Order").new({ 
+			key = orderKey, 
+			order = partnerOrderId, 
+			rechargeId = rechargeId, 
+		})
+		order:create()
+		-- 正在进行中的订单 缓存
+		redisproxy:hset(string.format(R_ORDERS, roleId), rechargeId, orderId)
+		return partnerOrderId
+	end
+
+	-- 更新订单信息
+	--[[
+
+	status
+
+	success
+	fail
+	finsh
+	unknow
+
+	--]]
+	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) })
+		if not orderObject:load() then
+			return false
+		end
+
+		local rechargeId = orderObject:getProperty("rechargeId")
+		local dataSet = csvdb["shop_rechargeCsv"][rechargeId]
+
+		if orderObject:getProperty("finishTime") > 0 then
+			return false, "finsh"
+		end
+		
+		if platformOrder then
+			orderObject:setProperty("transactionId", platformOrder)
+		end
+		orderObject:setProperty("status", status)
+
+		-- 开始下单
+		if status == "success" then
+		elseif status == "fail" then
+			redisproxy:hdel(string.format(R_ORDERS, roleId), rechargeId)
+		elseif status == "finsh" then
+			orderObject:setProperty("finishTime", skynet.time())
+			redisproxy:hdel(string.format(R_ORDERS, roleId), rechargeId)
+		end
+
+		if status ~= "unknow" then
+			self:log("setOrder", {
+				order_status = ({success = 100, finsh = 200, fail = 300})[status] or 1000, -- "订单状态：100 - 开始下单（玩家还未开始付费行为记录）200 - 支付完成并发货（SDK通知可以发货时记录），300 - 订单被取消，1000 - 其他"
+				item_id = rechargeId, -- 道具id
+				item_type = dataSet.type, -- 购买的道具类型，具体见"onItems"方法中道具类型枚举表
+				item_name = dataSet.title, -- 购买的道具名
+				item_number = 1, -- 购买的道具数量
+				item_level = 1, -- 购买的道具等级
+				order_cost = dataSet.rmb * 100, -- 此次消费的现金金额（单位：分），如 51800即未518元，对应客户端SDK传入的'total_fee'
+				order_currency = "CNY", -- 货币类型，默认为"CNY"（人民币），遵循ISO 4217规范
+				order_type = self:getProperty("rmbC") > 0 and 0 or 1, -- 订单类型，首充记录为1，否则为0
+				order_id = platformOrder, -- 本条记录的订单号,对应客户端SDK返回的'bs_trade_no'
+			})
+		end
+
+		return true, rechargeId
+	end
 	-- 充值 --
 	--[[
@@ -1511,63 +1607,37 @@ function RolePlugin.bind(Role)
 		local roleId = self:getProperty("id")
 		local partnerOrderStr = params.order
-		local _, _, orderId = string.match(partnerOrderStr, "(.+)_(.+)_(.+)")
-		local orderObject = require("models.Order").new({ key = string.format("order:%d:%d", roleId, orderId) })
-		if not orderObject:load() then
-			-- 订单不存在
-			skynet.error("ayncPurchaseRpc", string.format("order %s not exist", partnerOrderStr))
-			return
-		end
-		if orderObject:getProperty("finishTime") > 0 then
-			-- 订单已经处理
-			SendPacket(actionCodes.Store_ayncPurchaseRpc, MsgPack.pack({ result = "handled" }))
+		local status, back = self:updatePurchaseOrder(partnerOrderStr, params.transactionId, "finsh")
+		if not status then
+			if back == "finsh" then
+				-- 订单已经处理
+				SendPacket(actionCodes.Store_ayncPurchaseRpc, MsgPack.pack({ result = "handled" }))
+			end
 			return
 		end
-		local rechargeId = orderObject:getProperty("rechargeId")
+		local rechargeId = back
 		local rechargeData = csvdb["shop_rechargeCsv"][rechargeId]
 		if rechargeData.rmb ~= tonumber(params.amount) then
-			skynet.error(string.format("fake order: %s, roleId: %d, order: %s,  rmb %s, get %s", 
+			skynet.error(string.format("[recharge] fake order: %s, roleId: %d, order: %s,  rmb %s, get %s", 
 				params.transactionId, roleId, partnerOrderStr, rechargeData.rmb, params.amount
 			))
 			return
 		end
-		local order_type = self:getProperty("rmbC") > 0 and 0 or 1
 		local status, reward = self:recharge({ 
 			id = rechargeId,
 			transactionId = params.transactionId,
 			pay_time = params.pay_time,
 			order = partnerOrderStr,
 		})
-		orderObject:setProperty("finishTime", skynet.time())
-		orderObject:setProperty("status", "finish")
-
-		redisproxy:srem(string.format("role:%d:orders", roleId), partnerOrderStr)
 		if not status then
-			status = 200
-		else
-			status = 1000 + status
-		end
-		self:log("setOrder", {
-			order_status = status, -- "订单状态：100 - 开始下单（玩家还未开始付费行为记录）200 - 支付完成并发货（SDK通知可以发货时记录），300 - 订单被取消，1000 - 其他"
-			item_id = rechargeId, -- 道具id
-			item_type = rechargeData.type, -- 购买的道具类型，具体见"onItems"方法中道具类型枚举表
-			item_name = rechargeData.title, -- 购买的道具名
-			item_number = 1, -- 购买的道具数量
-			item_level = 1, -- 购买的道具等级
-			order_cost = rechargeData.rmb * 100, -- 此次消费的现金金额（单位：分），如 51800即未518元，对应客户端SDK传入的'total_fee'
-			order_currency = "CNY", -- 货币类型，默认为"CNY"（人民币），遵循ISO 4217规范
-			order_type = order_type, -- 订单类型，首充记录为1，否则为0
-			order_id = params.transactionId, -- 本条记录的订单号,对应客户端SDK返回的'bs_trade_no'
-		})
-		if status ~= 200 then return end
-		
-		SendPacket(actionCodes.Store_ayncPurchaseRpc, MsgPack.pack({ order = partnerOrderStr,
-			result = "success", reward = reward}))
+			SendPacket(actionCodes.Store_ayncPurchaseRpc, MsgPack.pack({ order = partnerOrderStr,
+				result = "success", reward = reward}))
+		end
-		return orderObject:getProperty("rechargeId")
+		return rechargeId
 	end
@@ -1575,7 +1645,7 @@ function RolePlugin.bind(Role)
 		local id = tonumber(params.id)
 		local rechargeData = csvdb["shop_rechargeCsv"][id]
 		if not rechargeData then
-			skynet.error("recharge id not exist", id)
+			skynet.error("[recharge] recharge id not exist", id)
 			return 1
 		end
@@ -1600,7 +1670,7 @@ function RolePlugin.bind(Role)
 		elseif rechargeData.shop == 3 then  -- 礼包商店
 			reward, _ = self:award(rechargeData.itemFirst, {isRecharge = true, log = {desc = "recharge", int1 = id}})
 		else
-			skynet.error("invalid recharge shop type " .. id)
+			skynet.error("[recharge] invalid recharge shop type " .. id)
 			return 3
 		end
@@ -90,7 +90,7 @@ function Role:updateTimeReset(now, notify)
 	self:setProperties({timeReset = timeReset, ltime = now})
 	response.timeReset = timeReset
-	response.ltime = ltime
+	response.ltime = now
 	if notify then
 		self:notifyUpdateProperties(response)
@@ -224,9 +224,9 @@ end
 --检测购买是否超过限制数量
 function Store:checkRechargeRecord(limit, id)
-    local rechargeRecord = self:getProperty("payR")
+    local rechargeRecord = self:getProperty("payR") or {}
     if limit ~= 0 and limit <= (rechargeRecord[id] or 0) then
-        skynet.error(string.format("recharge id:%d count over limit, user id:%d", id, self.owner:getProperty("id")))
+        skynet.error(string.format("[recharge] recharge id:%d count over limit, user id:%d", id, self.owner:getProperty("id")))
         return false
     end
     rechargeRecord[id] = (rechargeRecord[id] or 0) + 1
@@ -383,6 +383,7 @@ end
 -- 购买付费签到 按开服时间算奖励
 function Store:onBuyPaySignCard(dur)
     local curTs = skynet.timex()
+	curTs = getServerOpenTs()
     self:SetActGoodsFlag("paySignIn", curTs)
@@ -419,7 +420,35 @@ function Store:checkPaySignReward()
 	end
 end
+-- 临时用 登录触发限时礼包 时间点以后
+function Store:OnTriggerLimitTimePackAfterTs(eventType, param)
+    local limitPack = self:getProperty("limitTPack")
+    local timeNow = skynet.timex()
+    local config = nil
+    for id, cfg in pairs(csvdb["shop_packCsv"]) do
+        local ts = toUnixtime(""..cfg.condition)
+        if cfg.type == eventType and ts < param then
+            config = cfg
+
+            if config ~= nil then
+                local rechargeCfg = csvdb["shop_rechargeCsv"][config.packId]
+                if rechargeCfg then
+                    if not limitPack[rechargeCfg.id] then
+                        limitPack[rechargeCfg.id] = {timeNow + rechargeCfg.time, config.id}
+                        self.owner:log("push_gift", {
+                            gift_id = rechargeCfg.id, --礼包ID
+                            gift_name = rechargeCfg.title,   --礼包名称
+                        })
+                        self:updateProperty({field = "limitTPack", value = limitPack, notNotify = false})
+                    end
+                end
+            end
+        end
+    end
+end
+
 function Store:data()
+    self:OnTriggerLimitTimePackAfterTs(TriggerEventType.AfterTs, skynet.timex())
 	return {
         buyR		= self:getProperty("buyR"),
         payR	= self:getProperty("payR"),
@@ -167,7 +167,7 @@ function diffFromTs(ts)
 	local time = os.time({year = tm.year, month = tm.month, day = tm.day, hour = RESET_TIME})
 	if now < time then
-		return -1
+		return 0
 	end
 	return math.floor((now - time) / DAY_SEC)