Commit 3e4079d937e16ca58da05a8e5442b7524cf72a30

Authored by 熊润斐
2 parents 073ba265 c888fcc3

Merge branch 'develop' into tr/publish

src/actions/GmAction.lua
@@ -543,4 +543,21 @@ function _M.ayncPurchase(role, params) @@ -543,4 +543,21 @@ function _M.ayncPurchase(role, params)
543 return role:handlePurchase(params) or "" 543 return role:handlePurchase(params) or ""
544 end 544 end
545 545
  546 +function _M.cz(role, pms)
  547 + local id = tonum(pms.pm1)
  548 + local csvData = csvdb["shop_rechargeCsv"][id]
  549 + if not csvData then
  550 + return "充值id错误, 查看shop_recharge.csv"
  551 + end
  552 + role:recharge({
  553 + id = id,
  554 + transactionId = "GM",
  555 + order = "GM",
  556 + pay_time = skynet.timex(),
  557 + })
  558 + role:mylog("gm_action", {desc = "recharge", int1 = id, key1 = pms.sender})
  559 + return "指令成功"
  560 +end
  561 +
  562 +
546 return _M 563 return _M
547 \ No newline at end of file 564 \ No newline at end of file
src/models/Role.lua
@@ -386,7 +386,8 @@ function Role:data() @@ -386,7 +386,8 @@ function Role:data()
386 chatline = self:getProperty("chatline"), 386 chatline = self:getProperty("chatline"),
387 387
388 downCvR = self:getProperty("downCvR"), -- 下载cv扩展包奖励 388 downCvR = self:getProperty("downCvR"), -- 下载cv扩展包奖励
389 - feedback = self:getProperty("feedback") 389 + feedback = self:getProperty("feedback"),
  390 + ctime = self:getProperty("ctime"),
390 } 391 }
391 end 392 end
392 393
src/models/RolePlugin.lua
@@ -1536,7 +1536,7 @@ function RolePlugin.bind(Role) @@ -1536,7 +1536,7 @@ function RolePlugin.bind(Role)
1536 item_number = 1, -- 购买的道具数量 1536 item_number = 1, -- 购买的道具数量
1537 item_level = 1, -- 购买的道具等级 1537 item_level = 1, -- 购买的道具等级
1538 order_cost = rechargeData.rmb * 100, -- 此次消费的现金金额(单位:分),如 51800即未518元,对应客户端SDK传入的'total_fee' 1538 order_cost = rechargeData.rmb * 100, -- 此次消费的现金金额(单位:分),如 51800即未518元,对应客户端SDK传入的'total_fee'
1539 - order_currency = "TWD", -- 货币类型,默认为"CNY"(人民币),遵循ISO 4217规范 1539 + order_currency = "CNY", -- 货币类型,默认为"CNY"(人民币),遵循ISO 4217规范
1540 order_type = order_type, -- 订单类型,首充记录为1,否则为0 1540 order_type = order_type, -- 订单类型,首充记录为1,否则为0
1541 order_id = params.transactionId, -- 本条记录的订单号,对应客户端SDK返回的'bs_trade_no' 1541 order_id = params.transactionId, -- 本条记录的订单号,对应客户端SDK返回的'bs_trade_no'
1542 }) 1542 })