Merge branch 'cn/develop' into cn/publish/release

jiyue
2 parents 1a427820 7d5e688f
Showing 7 changed files with 84 additions and 12 deletions Show diff stats
src/ProtocolCode.lua
src/actions/RoleAction.lua
src/actions/StoreAction.lua
src/agent.lua
src/csvdata
src/models/Activity.lua
src/models/RolePlugin.lua
@@ -232,6 +232,7 @@ actionCodes = {
 	Store_getTotalRechargeAwardRpc = 564,	-- 累计充值
 	Store_monthCardRewardRpc = 565, --每日月卡+特刊奖励
     Store_dyhxAndroidRechargeRpc = 566, -- 东银河充值
+	Store_getCpOrderIdRpc = 567,	-- 生成充值订单号
  
 	Store_biliCloudRechargeRpc = 596,
 	Store_biliAndroidRechargeRpc = 597,
@@ -334,6 +334,7 @@ function _M.loginRpc( agent, data )
  
 	local hangPass = role:getProperty("hangPass")
 	role:mylog("login", {key1 = agent.ip:toArray(false, ":")[1], int1 = hangPass[1] or 0})
+	role:onUploadLoginout(1, agent.client_fd)
  
 	-- 是否是新设备
 	local deviced = cluster.query("center", "deviced")
@@ -344,6 +345,15 @@ function _M.loginRpc( agent, data )
 		end
 	end
  
+	-- 临时处理方式，清空电台活动队伍
+		local radioTask = role:getProperty("radioTask")
+		for id, data in pairs(radioTask) do
+			if (data["actid"] or 0) ~= 0 then
+				radioTask[id] = nil
+			end
+		end
+	---
+
 	return true
 end
  
@@ -281,6 +281,37 @@ function _M.dyhxAndroidRechargeRpc(agent, data)
 	return true
 end
  
+local rechargeHandler = {
+	ali = function(cp_order_id, rechargeId, result)
+	end,
+	wx = function(cp_order_id, rechargeId, result)
+	end,
+}
+
+function _M.getCpOrderIdRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+	local id = msg.id
+	local type = msg.skd_type or ""
+	local choose = msg.choose or ""
+	local dataSet = csvdb["shop_rechargeCsv"][id]
+	if not dataSet then return end
+	local roleId = role:getProperty("id")
+
+	role.ignoreHeartbeat = true
+	--创建订单号
+	local partnerOrderId = role:getPurchaseOrder(id,nil,choose)
+
+	local result = {}
+	result["order"] = partnerOrderId
+	local handler = rechargeHandler[type]
+	if handler then
+		handler(partnerOrderId, id, result)
+	end
+
+	SendPacket(actionCodes.Store_getCpOrderIdRpc, MsgPack.pack(result))
+end
+
  
 function _M.purchaseOrderResult(agent, data)
 	local role = agent.role
@@ -295,6 +295,7 @@ function CMD.close()
 	role:log("onLogout", {logtime = skynet.timex()-role:getProperty("ltime")})
 	role:mylog("logout", {int1 = skynet.timex()-role:getProperty("ltime")})
 	role:onOfflineEvent()
+	role:onUploadLoginout(0, agentInfo.client_fd)
 end
  
 function CMD.exit()
-Subproject commit bd0ab7120f5574d3a720dd1bbeb513fb67b6d21b
+Subproject commit 3fe1beb0f0efedddb79ccfac950b8eeca98f9c91
@@ -1488,12 +1488,13 @@ activityFunc[Activity.ActivityType.RadioTask] = {
 				if config.activity_ctrl_id == actid then 
 					radioTask[id] = nil
  
-					if not task then return 4 end
-					if skynet.timex() < task.time then return 5 end
-
-					local reward = getActRadioTaskReward(self.owner, id, task)
-					for k, v in pairs(reward) do
-						result[k] = (result[k] or 0) + v
+					if task then 
+						if skynet.timex() > task.time then 
+							local reward = getActRadioTaskReward(self.owner, id, task)
+							for k, v in pairs(reward) do
+								result[k] = (result[k] or 0) + v
+							end
+						end
 					end
 				end
 			end
@@ -36,6 +36,25 @@ function RolePlugin.bind(Role)
         self:saveRoleData()
 	end
  
+	-- 上报中宣数据
+	function Role:onUploadLoginout(bt, session)
+		local uid = self:getProperty("uid")
+		local id = self:getProperty("id")
+		local time = skynet.timex()
+		local si = string.format("%s_%s", id, session)
+		local info = {{si = si, bt = bt, ot = time}}
+
+		local codeurl = skynet.getenv("codeurl")
+		local content = {
+			["si"] = si,
+			["bt"] = bt,
+			["ot"] = time,
+			["uid"] = uid,
+			["key"] = "zhaolugame20170831",
+		}
+		httpc.get(codeurl, "/collect?" .. httpGetFormatData(content), {})
+	end
+
 	local function checkItemCount(self, itemId, count)
 		local itemData = csvdb["itemCsv"][itemId]
 		-- 种类 类型数量限制
@@ -2410,11 +2429,20 @@ function RolePlugin.bind(Role)
 		end
 		local rechargeId = back
 		local rechargeData = csvdb["shop_rechargeCsv"][rechargeId]
-		if (params.is_mycard and rechargeData.twd * 100 ~= tonumber(params.amount)) or (not params.is_mycard and ((rechargeData.rmb * 100) / globalCsv.QArecharge) ~= tonumber(params.amount)) then
-			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
+		if params.amount == 0 then
+			if params.product_id ~= rechargeData.iap_product_id then
+				skynet.error(string.format("[recharge] fake order: %s, roleId: %d, order: %s,  rmb %s, get %s", 
+					params.transactionId, roleId, partnerOrderStr, rechargeData.iap_product_id, params.product_id
+				))
+				return
+			end
+		else
+			if (params.is_mycard and rechargeData.twd * 100 ~= tonumber(params.amount)) or (not params.is_mycard and ((rechargeData.rmb * 100) / globalCsv.QArecharge) ~= tonumber(params.amount)) then
+				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
 		end
  
 		local status, reward = self:recharge({