com.xd.sdk.payment 6.22.3 → 6.23.0

package/Mobile/XDGPaymentMobile.cs

@@ -11,6 +11,11 @@ namespace  XD.SDK.Payment{
             XDGPaymentMobileImpl.GetInstance().PayWithProduct(orderId, productId, roleId, serverId, ext, callback);
         }
 
+        public void PayWithParams(XDGPaymentParams paymentParams, Action<XDGOrderInfoWrapper> callback)
+        {
+            XDGPaymentMobileImpl.GetInstance().PayWithParams(paymentParams, callback);
+        }
+
         public static void PayWithWeb(
             string orderId,
             string productId,

package/Mobile/XDGPaymentMobileImpl.cs

@@ -4,6 +4,7 @@ using LC.Newtonsoft.Json;
 using TapTap.Common;
 using UnityEngine;
 using XD.SDK.Common;
+using XD.SDK.Common.Internal;
 
 namespace  XD.SDK.Payment{
     public class XDGPaymentMobileImpl{
@@ -48,6 +49,35 @@ namespace  XD.SDK.Payment{
                 callback(new XDGSkuDetailInfoMobile(result.content) as XDGSkuDetailInfo);
             });
         }
+        
+        public void PayWithParams(XDGPaymentParams paymentParams, Action<XDGOrderInfoWrapper> callback)
+        {
+            var paramsDic = new Dictionary<string, object>{
+                {"gameOrderId", paymentParams.gameOrderId},
+                {"productId", paymentParams.productId},
+                {"roleId", paymentParams.roleId},
+                {"serverId", paymentParams.serverId},
+                {"ext", paymentParams.ext},
+                {"quantity", paymentParams.quantity}
+            };
+            var dic = new Dictionary<string, object>
+            {
+                {"params", paramsDic}
+            };
+
+            var command = new Command.Builder()
+                .Service(XDG_PAYMENT_SERVICE)
+                .Method("payWithParams")
+                .Args(dic)
+                .Callback(true)
+                .OnceTime(true)
+                .CommandBuilder();
+            EngineBridge.GetInstance().CallHandler(command,
+                (result) => {
+                    XDGLogger.Debug("PayWithParams 方法结果: " + result.ToJSON());
+                    callback(new XDGOrderInfoWrapperMobile(result.content) as XDGOrderInfoWrapper);
+                });
+        }
 
         public void PayWithProduct(string orderId, string productId, string roleId, string serverId, string ext,
             Action<XDGOrderInfoWrapper> callback){

package/Plugins/iOS/XDPaymentSDK.framework/Headers/XDGPayment.h

@@ -5,6 +5,8 @@
 
 @class XDGOrderInfo;
 
+@class XDGPaymentParams;
+
 #import <XDPaymentSDK/XDGTransactionInfo.h>
 
 NS_ASSUME_NONNULL_BEGIN
@@ -44,6 +46,11 @@ typedef void(^XDGRePaymentCallback)(XDGRepayMentCode code,NSString * _Nullable m
 /// @param completionHandler 查询结果处理
 + (void)queryWithProductIds:(NSArray *)productIds completionHandler:(XDGQueryProductsCallback)completionHandler;
 
+/// 支付商品 （支持批量购买）
+/// @param paymentParam 支付参数
+/// @param completionHandler 支付结果回调
++ (void)payWithParams:(XDGPaymentParams *)paymentParam completionHandler:(XDGPaymentCallback)completionHandler;
+
 /// 支付商品
 /// @param orderId 商品ID
 /// @param productId 商品ID

package/Plugins/iOS/XDPaymentSDK.framework/Headers/XDGPaymentParams.h

@@ -0,0 +1,25 @@
+//
+//  XDGPaymentParams.h
+//  XDPaymentSDK
+//
+//  Created by Fattycat on 2024/9/13.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface XDGPaymentParams : NSObject
+
+@property(nonatomic, strong, nullable) NSString *gameOrderId;
+@property(nonatomic, strong) NSString *productId;
+@property(nonatomic, strong, nullable) NSString *roleId;
+@property(nonatomic, strong, nullable) NSString *serverId;
+@property(nonatomic, strong, nullable) NSString *ext;
+@property(nonatomic, assign) NSInteger quantity;
+
+- (NSError *_Nullable)checkValid;
+
+@end
+
+NS_ASSUME_NONNULL_END

package/Plugins/iOS/XDPaymentSDK.framework/Headers/XDGPaymentParams.h.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 99b31cdab1e4b4b14b89b4dcd5003f5e
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Plugins/iOS/XDPaymentSDK.framework/Headers/XDGPaymentService.h

@@ -10,9 +10,13 @@
 NS_ASSUME_NONNULL_BEGIN
 
 @interface XDGPaymentService : NSObject
+
 // 查询  queryWithProductIds ：
 + (void)productIds:(NSArray *)productIds bridgeCallback:(void (^)(NSString *result))callback;
 
++ (void)params:(NSDictionary *)params
+bridgeCallback:(void (^)(NSString *result))callback;
+
 // 支付  payWithProduct
 + (void)orderId:(NSString *)orderId
              productId:(NSString *)productId
@@ -23,14 +27,13 @@ NS_ASSUME_NONNULL_BEGIN
 
 + (void)queryRestoredPurchases:(void (^)(NSString *result))callback;
 
-+ (void)purchaseToken:(NSString *)purchaseToken
-              productId:(NSString *)productId
-                orderId:(NSString *)orderId
-                 roleId:(NSString *)roleId
-               serverId:(NSString *)serverId
-                    ext:(NSString *)ext
-                   ext2:(NSString *)ext2
-         bridgeCallback:(void (^)(NSString *result))callback;
++ (void)transactionIdentifier:(NSString *)transactionIdentifier
+            productIdentifier:(NSString *)productIdentifier
+                      orderId:(NSString *)orderId
+                       roleId:(NSString *)roleId
+                     serverId:(NSString *)serverId
+                          ext:(NSString *)ext
+               bridgeCallback:(void (^)(NSString *result))callback;
 
 ///  不带界面的补款
 + (void)checkRefundStatus:(void (^)(NSString *result))callback;

package/Plugins/iOS/XDPaymentSDK.framework/Headers/XDGPaymentVersion.h

@@ -5,5 +5,5 @@
 //  Created by Fattycat on 2023/4/14.
 //
 
-#define XDGPayment_VERSION @"6.22.3"
-// HASH 8f76a97
+#define XDGPayment_VERSION @"6.23.0"
+// HASH 98afc55

package/Plugins/iOS/XDPaymentSDK.framework/Headers/XDPaymentSDK.h

@@ -21,3 +21,4 @@ FOUNDATION_EXPORT const unsigned char XDPaymentSDKVersionString[];
 #import <XDPaymentSDK/XDGOrderInfo.h>
 #import <XDPaymentSDK/XDGPaymentService.h>
 #import <XDPaymentSDK/XDGPaymentVersion.h>
+#import <XDPaymentSDK/XDGPaymentParams.h>

package/Runtime/IXDGPayment.cs

@@ -5,6 +5,8 @@ namespace XD.SDK.Payment
 {
     public interface IXDGPayment
     {
+        void PayWithParams(XDGPaymentParams paymentParams, Action<XDGOrderInfoWrapper> callback);
+        
         void PayWithProduct(string orderId, string productId, string roleId, string serverId, string ext,
             Action<XDGOrderInfoWrapper> callback);
 

package/Runtime/XDGPayment.cs

@@ -26,6 +26,11 @@ namespace XD.SDK.Payment{
                 TapLogger.Error($"No class implements {interfaceType} Type. Current Platform: {Application.platform}, if you are using Editor, please check if you have installed XDSDK pc module.");
             }
         }
+
+        public static void PayWithParams(XDGPaymentParams paymentParams, Action<XDGOrderInfoWrapper> callback)
+        {
+            platformWrapper.PayWithParams(paymentParams, callback);
+        }
         
         public static void PayWithProduct(string orderId, string productId, string roleId, string serverId, string ext,
             Action<XDGOrderInfoWrapper> callback){

package/Runtime/XDGPaymentParams.cs

@@ -0,0 +1,82 @@
+using XD.SDK.Common.Internal;
+
+namespace XD.SDK.Payment
+{
+    public class XDGPaymentParams
+    {
+        /// <summary>
+        /// 游戏订单号
+        /// 可以为空，为空时 SDK 会自动生成
+        /// </summary>
+        public string gameOrderId;
+        
+        /// <summary>
+        /// 商品ID
+        /// 不能为空
+        /// </summary>
+        public string productId;
+        
+        /// <summary>
+        /// 角色 ID
+        /// 不建议为空
+        /// </summary>
+        public string roleId;
+        
+        /// <summary>
+        /// 服务器 ID
+        /// 不建议为空
+        /// </summary>
+        public string serverId;
+        
+        /// <summary>
+        /// 扩展字段
+        /// 可以为空，透传给游戏服务器
+        /// </summary>
+        public string ext;
+        
+        /// <summary>
+        /// 数量
+        /// 只在 Apple 支付时有效,限制为 1-10，默认为 1
+        /// </summary>
+        public int quantity = 1;
+        
+        public XDGPaymentParams()
+        {
+        }
+        
+        public XDGPaymentParams(string gameOrderId, string productId, string roleId, string serverId, string ext)
+        {
+            this.gameOrderId = gameOrderId;
+            this.productId = productId;
+            this.roleId = roleId;
+            this.serverId = serverId;
+            this.ext = ext;
+            this.quantity = 1;
+        }
+        
+        public XDGPaymentParams(string gameOrderId, string productId, string roleId, string serverId, string ext, int quantity)
+        {
+            this.gameOrderId = gameOrderId;
+            this.productId = productId;
+            this.roleId = roleId;
+            this.serverId = serverId;
+            this.ext = ext;
+            this.quantity = quantity;
+        }
+        
+        public XDException CheckValid()
+        {
+            if (string.IsNullOrEmpty(productId))
+            {
+                return new XDException(XDException.InvalidParam, "productId can not be null or empty");
+            }
+            
+            if (quantity < 1 || quantity > 10)
+            {
+                return new XDException(XDException.InvalidParam, "quantity must be between 1 and 10");
+            }
+
+            return null;
+        }
+    }
+}

package/Runtime/XDGPaymentParams.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 9c153b234f1241c89697066cab33f483
+timeCreated: 1726805844

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "com.xd.sdk.payment",
   "displayName": "XDSDK Payment",
-  "version": "6.22.3",
+  "version": "6.23.0",
   "description": "XDSDK",
   "unity": "2018.3",
   "license": "MIT",
   "dependencies": {
-    "com.xd.tds.common": "3.27.1-xd.1"
+    "com.xd.tds.common": "3.29.4-xd.2"
   }
 }