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

jiyue
2 parents 0fc44ee1 1e74806a
Showing 3 changed files with 5 additions and 3 deletions Show diff stats
src/actions/RoleAction.lua
src/models/RolePlugin.lua
src/models/Store.lua
@@ -1768,6 +1768,8 @@ function _M.itemConvertSpecialRpc(agent, data)
 		local tmpreward, _ = role.storeData:onBuyCard(rechargeData.type, rechargeData.time, rechargeData.id, rechargeData.activity_id)
 		if tmpreward then
 			table.rewardMerge(reward, tmpreward)
+		else
+			return 6
 		end
 	end
@@ -2767,7 +2767,7 @@ function RolePlugin.bind(Role)
 		local send = {
 			game_id = 4818,
-			uid = uid,
+			uid = "90003",
 			merchant_id = 1,
 			server_id = 3957,
 			version = "1",
@@ -378,7 +378,7 @@ function Store:buySMonthCard(id)
         --续刊
         local card = csvdb["shop_cardCsv"][id] or {}
         if card["buyLimit"] and card["buyLimit"] ~= "" then
-            if self:buySMonthCardLimit(card["buyLimit"]:toNumMap()) == false then
+            if not self:buySMonthCardLimit(card["buyLimit"]:toNumMap()) then
                 skynet.error("不满足购买条件")
                 return false
             end
@@ -399,7 +399,7 @@ function Store:buySMonthCard(id)
         --增刊
         local card = csvdb["shop_cardCsv"][id] or {}
         if card["buyLimit"] and card["buyLimit"] ~= "" then
-            if self:buySMonthCardLimit(card["buyLimit"]:toNumMap()) == false then
+            if not self:buySMonthCardLimit(card["buyLimit"]:toNumMap()) then
                 skynet.error("不满足增刊条件")
                 return false
             end