diff --git a/lua/app/common/pay_manager.lua b/lua/app/common/pay_manager.lua index 089f7c81..dbbd0800 100644 --- a/lua/app/common/pay_manager.lua +++ b/lua/app/common/pay_manager.lua @@ -1,7 +1,5 @@ local PayManager = class("PayManager", BaseModule) -local BLESSING_GIFT_ID = 30001 - PayManager.PURCHARSE_TYPE = { ACT_GIFT = 1, ACT_GOLD_PIG = 2, @@ -146,7 +144,7 @@ function PayManager:purchasePackage(id, purchaseType) end function PayManager:requestRewards(purchaseToken, orderId, originOrderId, productId, notShowRewardsBox, callback) - self:sendMsgToServer(purchaseToken, orderId, originOrderId, function(binder, msgData) + self:sendMsgToServer(purchaseToken, orderId, originOrderId, productId, function(binder, msgData) if msgData.status == 0 then local showRewards = not notShowRewardsBox if DataManager.TutorialData and DataManager.TutorialData:getIsInTutorial() then -- 引导时不弹 @@ -269,23 +267,8 @@ function PayManager:checkAndPay(productId, id, purchaseType, rechargeId) end) end -function PayManager:sendMsgToServer(purchaseToken, orderId, originOrderId, callback) - local args = { - uuid = {orderId}, - channel = SDKManager:getSDKPayType(), - } - if Platform:isIosPlatform() then - local purchaseTokenObj = json.decode(purchaseToken) - if purchaseTokenObj == nil then - return -- 解析错误 - end - args.pay_token = purchaseTokenObj.Payload - else - args.pay_token = purchaseToken - end - if EDITOR_MODE then - args.channel = SDKManager.PAY_TYPE.DEBUG - end +function PayManager:sendMsgToServer(purchaseToken, uuid, originOrderId, productId, callback) + local args = SDKManager:getPurchaseArgs(purchaseToken, uuid, originOrderId, productId) self:sendMessage(ProtoMsgType.FromMsgEnum.ActPaidResultReq, args, {}, callback) end diff --git a/lua/app/common/sdk_manager.lua b/lua/app/common/sdk_manager.lua index 366ca11b..93dc038e 100644 --- a/lua/app/common/sdk_manager.lua +++ b/lua/app/common/sdk_manager.lua @@ -40,8 +40,9 @@ SDKManager.LOGIN_TYPE = { SDKManager.PAY_TYPE = { NONE = 0, GOOGLE = 1, - IOS = 2, - DEBUG = 10 + APPLE = 2, + DEBUG = 10, + DEPRECATED_APPLE = 11, } local PAY_TYPE_IN_APP = "inapp" @@ -150,6 +151,11 @@ function SDKManager:getIsSupportSDKPay() return SDKPayMgr:getIsSupportSDKPay() end +-- 获取支付参数 +function SDKManager:getPurchaseArgs(purchaseToken, uuid, channelOrderId, productId) + return SDKPayMgr:getPurchaseArgs(purchaseToken, uuid, channelOrderId, productId) +end + -- sdk将已完成的订单消耗掉 function SDKManager:consumePurchase(token, callback) SDKPayMgr:consumePurchase(token, callback) diff --git a/lua/app/common/sdk_pay_default_manager.lua b/lua/app/common/sdk_pay_default_manager.lua index 67b66ced..d5b47c23 100644 --- a/lua/app/common/sdk_pay_default_manager.lua +++ b/lua/app/common/sdk_pay_default_manager.lua @@ -31,9 +31,20 @@ function SDKPayDefaultManager:getPriceCurrencyCode(skuId) end function SDKPayDefaultManager:getSDKPayType() + if EDITOR_MODE then + return SDKManager.PAY_TYPE.DEBUG + end return SDKManager.PAY_TYPE.NONE end +function SDKPayDefaultManager:getPurchaseArgs(purchaseToken, uuid, channelOrderId, productId) + local args = { + channel = self:getSDKPayType(), + params = {uuid} + } + return args +end + -- 获取支付方式,目前只有google支付 function SDKPayDefaultManager:getIsSupportSDKPay() return false diff --git a/lua/app/common/sdk_pay_google_manager.lua b/lua/app/common/sdk_pay_google_manager.lua index c163590f..614ab2be 100644 --- a/lua/app/common/sdk_pay_google_manager.lua +++ b/lua/app/common/sdk_pay_google_manager.lua @@ -239,11 +239,15 @@ function SDKPayGoogleManager:getPriceCurrencyCode(skuId) end function SDKPayGoogleManager:getSDKPayType() - if Platform:getIsPublishChannel() then - return SDKManager.PAY_TYPE.GOOGLE - else - return SDKManager.PAY_TYPE.NONE - end + return SDKManager.PAY_TYPE.GOOGLE +end + +function SDKPayGoogleManager:getPurchaseArgs(purchaseToken, uuid, channelOrderId, productId) + local args = { + channel = self:getSDKPayType(), + params = {purchaseToken, productId} + } + return args end -- 获取支付方式,目前只有google支付 diff --git a/lua/app/common/sdk_pay_ios_manager.lua b/lua/app/common/sdk_pay_ios_manager.lua index aa4eb425..96a9dd58 100644 --- a/lua/app/common/sdk_pay_ios_manager.lua +++ b/lua/app/common/sdk_pay_ios_manager.lua @@ -182,11 +182,19 @@ function SDKPayiOSManager:getPriceCurrencyCode(skuId) end function SDKPayiOSManager:getSDKPayType() - if Platform:getIsPublishChannel() then - return SDKManager.PAY_TYPE.IOS - else - return SDKManager.PAY_TYPE.NONE + return SDKManager.PAY_TYPE.DEPRECATED_APPLE +end + +function SDKPayiOSManager:getPurchaseArgs(purchaseToken, uuid, channelOrderId, productId) + local purchaseTokenObj = json.decode(purchaseToken) + if purchaseTokenObj == nil then + return -- 解析错误 end + local args = { + channel = self:getSDKPayType(), + params = {purchaseTokenObj.Payload, channelOrderId} + } + return args end -- 获取支付方式,目前只有google支付