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

jiyue
2 parents 1df833f9 344d2df3
Showing 3 changed files with 31 additions and 5 deletions Show diff stats
src/actions/StoreAction.lua
src/models/RolePlugin.lua
src/services/dbseed.lua
 local _M = {}
 local md5 = require "md5"
+local httpc = require("http.httpc")
 -- 入口在正式服关闭  -- mock 充值
 function _M.rechargeRpc(agent , data)
@@ -282,9 +283,33 @@ function _M.dyhxAndroidRechargeRpc(agent, data)
 end
 local rechargeHandler = {
-	ali = function(cp_order_id, rechargeId, result)
+	ali = function(cp_order_id, rechargeId, cfg, result)
+		local codeurl = skynet.getenv("codeurl")
+		local content = {
+			["paytype"] = "alipay",
+			["rechargeid"] = rechargeId,
+			["order"] = cp_order_id,
+			["title"] = cfg.title,
+			["rmb"] = cfg.rmb,
+		}
+		local status, body = httpc.get(codeurl, "/payorder?" .. httpGetFormatData(content), {})
+		if status == 200 then
+			result["orderInfo"] = body
+		end
 	end,
-	wx = function(cp_order_id, rechargeId, result)
+	wx = function(cp_order_id, rechargeId, cfg, result)
+		local codeurl = skynet.getenv("codeurl")
+		local content = {
+			["paytype"] = "wxpay",
+			["rechargeid"] = rechargeId,
+			["order"] = cp_order_id,
+			["title"] = cfg.title,
+			["rmb"] = cfg.rmb,
+		}
+		local status, body = httpc.get(codeurl, "/payorder?" .. httpGetFormatData(content), {})
+		if status == 200 then
+			result["orderInfo"] = body
+		end
 	end,
 }
@@ -306,10 +331,11 @@ function _M.getCpOrderIdRpc(agent, data)
 	result["order"] = partnerOrderId
 	local handler = rechargeHandler[type]
 	if handler then
-		handler(partnerOrderId, id, result)
+		handler(partnerOrderId, id, dataSet, result)
 	end
 	SendPacket(actionCodes.Store_getCpOrderIdRpc, MsgPack.pack(result))
+	return true
 end
@@ -2429,7 +2429,7 @@ function RolePlugin.bind(Role)
 		end
 		local rechargeId = back
 		local rechargeData = csvdb["shop_rechargeCsv"][rechargeId]
-		if params.amount == 0 then
+		if tonumber(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
@@ -33,7 +33,7 @@ local function initRedisDb( ... )
 			return
 		end
 		local redisVal = tonum(redisproxy:hget(tbName, keyName))
-		if redisVal < mysqlVal then
+		if redisVal < mysqlVal or redisVal == 0 then
 			redisproxy:hset(tbName, keyName, mysqlVal)
 		end
 	end