wasteland / server

Commit 57c6d341399485698ce424fd7788734026f93f8a

Authored by zhouhaihai
2 parents ee7b3c2a 6df9d5e1

Merge branch 'tr/bugfix-qa' into tr/publish/qa-out 

* tr/bugfix-qa:
  mycard twd
  反回 的是twd
Showing 1 changed file with 3 additions and 2 deletions   Show diff stats
Inline Side-by-side
src/models/RolePlugin.lua
  Show/Hide comments   View file @57c6d34
@@ -1698,7 +1698,7 @@ function RolePlugin.bind(Role) @@ -1698,7 +1698,7 @@ function RolePlugin.bind(Role)
1698 for k , v in pairs(csvdb["shop_rechargeCsv"]) do 1698 for k , v in pairs(csvdb["shop_rechargeCsv"]) do
1699 if not v[pidField] then return "no product" end 1699 if not v[pidField] then return "no product" end
1700 if v[pidField] == params.product_id then 1700 if v[pidField] == params.product_id then
1701 - if v.rmb ~= params.money then 1701 + if v.twd ~= tonumber(params.money) then
1702 return "error money" 1702 return "error money"
1703 end 1703 end
1704 -- 发现需要的id 1704 -- 发现需要的id
@@ -1829,6 +1829,7 @@ function RolePlugin.bind(Role) @@ -1829,6 +1829,7 @@ function RolePlugin.bind(Role)
1829 request.pay_time = data.pay_time 1829 request.pay_time = data.pay_time
1830 request.transactionId = data.order_no 1830 request.transactionId = data.order_no
1831 request.extension_info = data.extension_info 1831 request.extension_info = data.extension_info
  1832 + request.is_mycard = 1
1832 ]] 1833 ]]
1833 function Role:handlePurchase(params) 1834 function Role:handlePurchase(params)
1834 local roleId = self:getProperty("id") 1835 local roleId = self:getProperty("id")
@@ -1844,7 +1845,7 @@ function RolePlugin.bind(Role) @@ -1844,7 +1845,7 @@ function RolePlugin.bind(Role)
1844 end 1845 end
1845 local rechargeId = back 1846 local rechargeId = back
1846 local rechargeData = csvdb["shop_rechargeCsv"][rechargeId] 1847 local rechargeData = csvdb["shop_rechargeCsv"][rechargeId]
1847 - if rechargeData.rmb ~= tonumber(params.amount) then 1848 + if (params.is_mycard and rechargeData.twd ~= tonumber(params.amount)) or (not params.is_mycard and rechargeData.rmb ~= tonumber(params.amount)) then
1848 skynet.error(string.format("[recharge] fake order: %s, roleId: %d, order: %s, rmb %s, get %s", 1849 skynet.error(string.format("[recharge] fake order: %s, roleId: %d, order: %s, rmb %s, get %s",
1849 params.transactionId, roleId, partnerOrderStr, rechargeData.rmb, params.amount 1850 params.transactionId, roleId, partnerOrderStr, rechargeData.rmb, params.amount
1850 )) 1851 ))