Merge branch 'develop' into tr/publish

熊润斐
2 parents 073ba265 c888fcc3
Showing 3 changed files with 20 additions and 2 deletions Show diff stats
src/actions/GmAction.lua
src/models/Role.lua
src/models/RolePlugin.lua
@@ -543,4 +543,21 @@ function _M.ayncPurchase(role, params)
 	return role:handlePurchase(params) or ""
 end
  
+function _M.cz(role, pms)
+	local id = tonum(pms.pm1)
+	local csvData = csvdb["shop_rechargeCsv"][id]
+	if not csvData then
+		return "充值id错误, 查看shop_recharge.csv"
+	end
+	role:recharge({
+		id = id,
+		transactionId = "GM",
+		order = "GM",
+		pay_time = skynet.timex(),
+	})
+	role:mylog("gm_action", {desc = "recharge", int1 = id, key1 = pms.sender})
+	return "指令成功"
+end
+
+
 return _M
 \ No newline at end of file
@@ -386,7 +386,8 @@ function Role:data()
 		chatline = self:getProperty("chatline"),
  
 		downCvR	= self:getProperty("downCvR"), -- 下载cv扩展包奖励 
-		feedback = self:getProperty("feedback")
+		feedback = self:getProperty("feedback"),
+		ctime = self:getProperty("ctime"),
 	}
 end
  
@@ -1536,7 +1536,7 @@ function RolePlugin.bind(Role)
 			item_number = 1, -- 购买的道具数量
 			item_level = 1, -- 购买的道具等级
 			order_cost = rechargeData.rmb * 100, -- 此次消费的现金金额（单位：分），如 51800即未518元，对应客户端SDK传入的'total_fee'
-			order_currency = "TWD", -- 货币类型，默认为"CNY"（人民币），遵循ISO 4217规范
+			order_currency = "CNY", -- 货币类型，默认为"CNY"（人民币），遵循ISO 4217规范
 			order_type = order_type, -- 订单类型，首充记录为1，否则为0
 			order_id = params.transactionId, -- 本条记录的订单号,对应客户端SDK返回的'bs_trade_no'
 		})