Browse Source

[WeChatPay] 调整 PrimaryHandler 参数顺序

Roc 4 years ago
parent
commit
f62350d985
74 changed files with 89 additions and 89 deletions
  1. 4 4
      src/Essensoft.Paylink.WeChatPay/V2/IWeChatPayCertRequest.cs
  2. 4 4
      src/Essensoft.Paylink.WeChatPay/V2/IWeChatPayRequest.cs
  3. 4 4
      src/Essensoft.Paylink.WeChatPay/V2/IWeChatPaySdkRequest.cs
  4. 1 1
      src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayAppSdkRequest.cs
  5. 1 1
      src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayBillCommentSpBatchQueryCommentRequest.cs
  6. 1 1
      src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayCloseOrderRequest.cs
  7. 1 1
      src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayDepositConsumeRequest.cs
  8. 1 1
      src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayDepositFacePayRequest.cs
  9. 1 1
      src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayDepositMicroPayRequest.cs
  10. 1 1
      src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayDepositOrderQueryRequest.cs
  11. 1 1
      src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayDepositRefundQueryRequest.cs
  12. 1 1
      src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayDepositRefundRequest.cs
  13. 1 1
      src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayDepositReverseRequest.cs
  14. 1 1
      src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayDownloadBillRequest.cs
  15. 1 1
      src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayDownloadFundFlowRequest.cs
  16. 1 1
      src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayGetHBInfoRequest.cs
  17. 1 1
      src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayGetTransferInfoRequest.cs
  18. 1 1
      src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayJsApiSdkRequest.cs
  19. 1 1
      src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayMicroPayRequest.cs
  20. 1 1
      src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayMiniProgramReceiveRedPacketSdkRequest.cs
  21. 1 1
      src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayMiniProgramSdkRequest.cs
  22. 1 1
      src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayMultiProfitSharingRequest.cs
  23. 1 1
      src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayOrderQueryRequest.cs
  24. 1 1
      src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayPaPayPartnerDeleteContractRequest.cs
  25. 1 1
      src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayPaPayPartnerEntrustWebRequest.cs
  26. 1 1
      src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayPaPayPartnerH5EntrustWebRequest.cs
  27. 1 1
      src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayPaPayPartnerQueryContractRequest.cs
  28. 1 1
      src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayPartnerPapOrderQueryRequest.cs
  29. 1 1
      src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayPartnerPapPayApplyRequest.cs
  30. 1 1
      src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayPayBankRequest.cs
  31. 1 1
      src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayPayitilReportRequest.cs
  32. 1 1
      src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayProfitSharingAddReceiverRequest.cs
  33. 1 1
      src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayProfitSharingFinishRequest.cs
  34. 1 1
      src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayProfitSharingMerchantRatioQueryRequest.cs
  35. 1 1
      src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayProfitSharingOrderAmountQueryRequest.cs
  36. 1 1
      src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayProfitSharingQueryRequest.cs
  37. 1 1
      src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayProfitSharingRemoveReceiverRequest.cs
  38. 1 1
      src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayProfitSharingRequest.cs
  39. 1 1
      src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayProfitSharingReturnQueryRequest.cs
  40. 1 1
      src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayProfitSharingReturnRequest.cs
  41. 1 1
      src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayPromotionPayWwSpTrans2PockeRequest.cs
  42. 1 1
      src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayPromotionQueryWwSpTrans2PockeRequest.cs
  43. 1 1
      src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayPromotionTransfersRequest.cs
  44. 1 1
      src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayQueryBankRequest.cs
  45. 1 1
      src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayQueryCouponStockRequest.cs
  46. 1 1
      src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayQueryCouponsInfoRequest.cs
  47. 1 1
      src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayQueryWorkWxRedPackRequest.cs
  48. 1 1
      src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayRefundQueryRequest.cs
  49. 1 1
      src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayRefundRequest.cs
  50. 1 1
      src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayReverseRequest.cs
  51. 1 1
      src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayRiskGetPublicKeyRequest.cs
  52. 1 1
      src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPaySendCouponRequest.cs
  53. 1 1
      src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPaySendGroupRedPackRequest.cs
  54. 1 1
      src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPaySendMiniProgramHbRequest.cs
  55. 1 1
      src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPaySendRedPackRequest.cs
  56. 1 1
      src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPaySendWorkWxRedPackRequest.cs
  57. 1 1
      src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayToolsAuthCodeToOpenIdRequest.cs
  58. 1 1
      src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayToolsShortUrlRequest.cs
  59. 1 1
      src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayTransitPartnerPayPayApplyRequest.cs
  60. 1 1
      src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayTransitPartnerPayQueryOrderRequest.cs
  61. 1 1
      src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayTransitPartnerPayQueryStateRequest.cs
  62. 1 1
      src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayUnifiedOrderRequest.cs
  63. 1 1
      src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayVehiclePartnerPayNotificationRequest.cs
  64. 1 1
      src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayVehiclePartnerPayPayApplyRequest.cs
  65. 1 1
      src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayVehiclePartnerPayQueryStateRequest.cs
  66. 1 1
      src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayVehiclePayNotificationRequest.cs
  67. 1 1
      src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayVehiclePayPayApplyRequest.cs
  68. 1 1
      src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayVehiclePayQueryStateRequest.cs
  69. 4 4
      src/Essensoft.Paylink.WeChatPay/V2/WeChatPayClient.cs
  70. 4 4
      src/Essensoft.Paylink.WeChatPay/V3/IWeChatPaySdkRequest.cs
  71. 1 1
      src/Essensoft.Paylink.WeChatPay/V3/Request/WeChatPayAppSdkRequest.cs
  72. 1 1
      src/Essensoft.Paylink.WeChatPay/V3/Request/WeChatPayJsApiSdkRequest.cs
  73. 1 1
      src/Essensoft.Paylink.WeChatPay/V3/Request/WeChatPayMiniProgramSdkRequest.cs
  74. 1 1
      src/Essensoft.Paylink.WeChatPay/V3/WeChatPayClient.cs

+ 4 - 4
src/Essensoft.Paylink.WeChatPay/V2/IWeChatPayCertRequest.cs

@@ -32,12 +32,12 @@ namespace Essensoft.Paylink.WeChatPay.V2
         }
 
         /// <summary>
-        /// 基本参数处理器
+        /// 参数处理器
         /// </summary>
-        /// <param name="options">配置选项</param>
-        /// <param name="signType">签名类型</param>
         /// <param name="sortedTxtParams">排序文本参数</param>
-        void PrimaryHandler(WeChatPayOptions options, WeChatPaySignType signType, WeChatPayDictionary sortedTxtParams);
+        /// <param name="signType">签名类型</param>
+        /// <param name="options">配置选项</param>
+        void PrimaryHandler(WeChatPayDictionary sortedTxtParams, WeChatPaySignType signType, WeChatPayOptions options);
 
         /// <summary>
         /// 是否需要检查响应内容签名

+ 4 - 4
src/Essensoft.Paylink.WeChatPay/V2/IWeChatPayRequest.cs

@@ -32,12 +32,12 @@ namespace Essensoft.Paylink.WeChatPay.V2
         }
 
         /// <summary>
-        /// 基本参数处理器
+        /// 参数处理器
         /// </summary>
-        /// <param name="options">配置选项</param>
-        /// <param name="signType">签名类型</param>
         /// <param name="sortedTxtParams">排序文本参数</param>
-        void PrimaryHandler(WeChatPayOptions options, WeChatPaySignType signType, WeChatPayDictionary sortedTxtParams);
+        /// <param name="signType">签名类型</param>
+        /// <param name="options">配置选项</param>
+        void PrimaryHandler(WeChatPayDictionary sortedTxtParams, WeChatPaySignType signType, WeChatPayOptions options);
 
         /// <summary>
         /// 是否需要检查响应内容签名

+ 4 - 4
src/Essensoft.Paylink.WeChatPay/V2/IWeChatPaySdkRequest.cs

@@ -13,10 +13,10 @@ namespace Essensoft.Paylink.WeChatPay.V2
         IDictionary<string, string> GetParameters();
 
         /// <summary>
-        /// 请求参数处理器
+        /// 参数处理器
         /// </summary>
-        /// <param name="options"></param>
-        /// <param name="sortedTxtParams"></param>
-        void PrimaryHandler(WeChatPayOptions options, WeChatPayDictionary sortedTxtParams);
+        /// <param name="sortedTxtParams">排序文本参数</param>
+        /// <param name="options">配置选项</param>
+        void PrimaryHandler(WeChatPayDictionary sortedTxtParams, WeChatPayOptions options);
     }
 }

+ 1 - 1
src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayAppSdkRequest.cs

@@ -29,7 +29,7 @@ namespace Essensoft.Paylink.WeChatPay.V2.Request
             return parameters;
         }
 
-        public void PrimaryHandler(WeChatPayOptions options, WeChatPayDictionary sortedTxtParams)
+        public void PrimaryHandler(WeChatPayDictionary sortedTxtParams, WeChatPayOptions options)
         {
             sortedTxtParams.Add(WeChatPayConsts.noncestr, WeChatPayUtility.GenerateNonceStr());
             sortedTxtParams.Add(WeChatPayConsts.timestamp, WeChatPayUtility.GetTimeStamp());

+ 1 - 1
src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayBillCommentSpBatchQueryCommentRequest.cs

@@ -54,7 +54,7 @@ namespace Essensoft.Paylink.WeChatPay.V2.Request
             return parameters;
         }
 
-        public void PrimaryHandler(WeChatPayOptions options, WeChatPaySignType signType, WeChatPayDictionary sortedTxtParams)
+        public void PrimaryHandler(WeChatPayDictionary sortedTxtParams, WeChatPaySignType signType, WeChatPayOptions options)
         {
             sortedTxtParams.Add(WeChatPayConsts.nonce_str, WeChatPayUtility.GenerateNonceStr());
             sortedTxtParams.Add(WeChatPayConsts.appid, options.AppId);

+ 1 - 1
src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayCloseOrderRequest.cs

@@ -36,7 +36,7 @@ namespace Essensoft.Paylink.WeChatPay.V2.Request
             return parameters;
         }
 
-        public void PrimaryHandler(WeChatPayOptions options, WeChatPaySignType signType, WeChatPayDictionary sortedTxtParams)
+        public void PrimaryHandler(WeChatPayDictionary sortedTxtParams, WeChatPaySignType signType, WeChatPayOptions options)
         {
             sortedTxtParams.Add(WeChatPayConsts.nonce_str, WeChatPayUtility.GenerateNonceStr());
             sortedTxtParams.Add(WeChatPayConsts.appid, options.AppId);

+ 1 - 1
src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayDepositConsumeRequest.cs

@@ -65,7 +65,7 @@ namespace Essensoft.Paylink.WeChatPay.V2.Request
             return WeChatPaySignType.HMAC_SHA256;
         }
 
-        public void PrimaryHandler(WeChatPayOptions options, WeChatPaySignType signType, WeChatPayDictionary sortedTxtParams)
+        public void PrimaryHandler(WeChatPayDictionary sortedTxtParams, WeChatPaySignType signType, WeChatPayOptions options)
         {
             sortedTxtParams.Add(WeChatPayConsts.nonce_str, WeChatPayUtility.GenerateNonceStr());
             sortedTxtParams.Add(WeChatPayConsts.appid, options.AppId);

+ 1 - 1
src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayDepositFacePayRequest.cs

@@ -124,7 +124,7 @@ namespace Essensoft.Paylink.WeChatPay.V2.Request
             return WeChatPaySignType.HMAC_SHA256;
         }
 
-        public void PrimaryHandler(WeChatPayOptions options, WeChatPaySignType signType, WeChatPayDictionary sortedTxtParams)
+        public void PrimaryHandler(WeChatPayDictionary sortedTxtParams, WeChatPaySignType signType, WeChatPayOptions options)
         {
             sortedTxtParams.Add(WeChatPayConsts.nonce_str, WeChatPayUtility.GenerateNonceStr());
             sortedTxtParams.Add(WeChatPayConsts.appid, options.AppId);

+ 1 - 1
src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayDepositMicroPayRequest.cs

@@ -124,7 +124,7 @@ namespace Essensoft.Paylink.WeChatPay.V2.Request
             return WeChatPaySignType.HMAC_SHA256;
         }
 
-        public void PrimaryHandler(WeChatPayOptions options, WeChatPaySignType signType, WeChatPayDictionary sortedTxtParams)
+        public void PrimaryHandler(WeChatPayDictionary sortedTxtParams, WeChatPaySignType signType, WeChatPayOptions options)
         {
             sortedTxtParams.Add(WeChatPayConsts.nonce_str, WeChatPayUtility.GenerateNonceStr());
             sortedTxtParams.Add(WeChatPayConsts.appid, options.AppId);

+ 1 - 1
src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayDepositOrderQueryRequest.cs

@@ -47,7 +47,7 @@ namespace Essensoft.Paylink.WeChatPay.V2.Request
             return WeChatPaySignType.HMAC_SHA256;
         }
 
-        public void PrimaryHandler(WeChatPayOptions options, WeChatPaySignType signType, WeChatPayDictionary sortedTxtParams)
+        public void PrimaryHandler(WeChatPayDictionary sortedTxtParams, WeChatPaySignType signType, WeChatPayOptions options)
         {
             sortedTxtParams.Add(WeChatPayConsts.nonce_str, WeChatPayUtility.GenerateNonceStr());
             sortedTxtParams.Add(WeChatPayConsts.appid, options.AppId);

+ 1 - 1
src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayDepositRefundQueryRequest.cs

@@ -47,7 +47,7 @@ namespace Essensoft.Paylink.WeChatPay.V2.Request
             return WeChatPaySignType.HMAC_SHA256;
         }
 
-        public void PrimaryHandler(WeChatPayOptions options, WeChatPaySignType signType, WeChatPayDictionary sortedTxtParams)
+        public void PrimaryHandler(WeChatPayDictionary sortedTxtParams, WeChatPaySignType signType, WeChatPayOptions options)
         {
             sortedTxtParams.Add(WeChatPayConsts.nonce_str, WeChatPayUtility.GenerateNonceStr());
             sortedTxtParams.Add(WeChatPayConsts.appid, options.AppId);

+ 1 - 1
src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayDepositRefundRequest.cs

@@ -77,7 +77,7 @@ namespace Essensoft.Paylink.WeChatPay.V2.Request
             return WeChatPaySignType.HMAC_SHA256;
         }
 
-        public void PrimaryHandler(WeChatPayOptions options, WeChatPaySignType signType, WeChatPayDictionary sortedTxtParams)
+        public void PrimaryHandler(WeChatPayDictionary sortedTxtParams, WeChatPaySignType signType, WeChatPayOptions options)
         {
             sortedTxtParams.Add(WeChatPayConsts.nonce_str, WeChatPayUtility.GenerateNonceStr());
             sortedTxtParams.Add(WeChatPayConsts.appid, options.AppId);

+ 1 - 1
src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayDepositReverseRequest.cs

@@ -47,7 +47,7 @@ namespace Essensoft.Paylink.WeChatPay.V2.Request
             return WeChatPaySignType.HMAC_SHA256;
         }
 
-        public void PrimaryHandler(WeChatPayOptions options, WeChatPaySignType signType, WeChatPayDictionary sortedTxtParams)
+        public void PrimaryHandler(WeChatPayDictionary sortedTxtParams, WeChatPaySignType signType, WeChatPayOptions options)
         {
             sortedTxtParams.Add(WeChatPayConsts.nonce_str, WeChatPayUtility.GenerateNonceStr());
             sortedTxtParams.Add(WeChatPayConsts.appid, options.AppId);

+ 1 - 1
src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayDownloadBillRequest.cs

@@ -48,7 +48,7 @@ namespace Essensoft.Paylink.WeChatPay.V2.Request
             return parameters;
         }
 
-        public void PrimaryHandler(WeChatPayOptions options, WeChatPaySignType signType, WeChatPayDictionary sortedTxtParams)
+        public void PrimaryHandler(WeChatPayDictionary sortedTxtParams, WeChatPaySignType signType, WeChatPayOptions options)
         {
             sortedTxtParams.Add(WeChatPayConsts.nonce_str, WeChatPayUtility.GenerateNonceStr());
             sortedTxtParams.Add(WeChatPayConsts.appid, options.AppId);

+ 1 - 1
src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayDownloadFundFlowRequest.cs

@@ -59,7 +59,7 @@ namespace Essensoft.Paylink.WeChatPay.V2.Request
             return WeChatPaySignType.HMAC_SHA256;
         }
 
-        public void PrimaryHandler(WeChatPayOptions options, WeChatPaySignType signType, WeChatPayDictionary sortedTxtParams)
+        public void PrimaryHandler(WeChatPayDictionary sortedTxtParams, WeChatPaySignType signType, WeChatPayOptions options)
         {
             sortedTxtParams.Add(WeChatPayConsts.nonce_str, WeChatPayUtility.GenerateNonceStr());
             sortedTxtParams.Add(WeChatPayConsts.appid, options.AppId);

+ 1 - 1
src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayGetHBInfoRequest.cs

@@ -42,7 +42,7 @@ namespace Essensoft.Paylink.WeChatPay.V2.Request
             return parameters;
         }
 
-        public void PrimaryHandler(WeChatPayOptions options, WeChatPaySignType signType, WeChatPayDictionary sortedTxtParams)
+        public void PrimaryHandler(WeChatPayDictionary sortedTxtParams, WeChatPaySignType signType, WeChatPayOptions options)
         {
             sortedTxtParams.Add(WeChatPayConsts.nonce_str, WeChatPayUtility.GenerateNonceStr());
             sortedTxtParams.Add(WeChatPayConsts.appid, options.AppId);

+ 1 - 1
src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayGetTransferInfoRequest.cs

@@ -36,7 +36,7 @@ namespace Essensoft.Paylink.WeChatPay.V2.Request
             return parameters;
         }
 
-        public void PrimaryHandler(WeChatPayOptions options, WeChatPaySignType signType, WeChatPayDictionary sortedTxtParams)
+        public void PrimaryHandler(WeChatPayDictionary sortedTxtParams, WeChatPaySignType signType, WeChatPayOptions options)
         {
             sortedTxtParams.Add(WeChatPayConsts.nonce_str, WeChatPayUtility.GenerateNonceStr());
             sortedTxtParams.Add(WeChatPayConsts.appid, options.AppId);

+ 1 - 1
src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayJsApiSdkRequest.cs

@@ -23,7 +23,7 @@ namespace Essensoft.Paylink.WeChatPay.V2.Request
             return parameters;
         }
 
-        public void PrimaryHandler(WeChatPayOptions options, WeChatPayDictionary sortedTxtParams)
+        public void PrimaryHandler(WeChatPayDictionary sortedTxtParams, WeChatPayOptions options)
         {
             sortedTxtParams.Add(WeChatPayConsts.timeStamp, WeChatPayUtility.GetTimeStamp());
             sortedTxtParams.Add(WeChatPayConsts.nonceStr, WeChatPayUtility.GenerateNonceStr());

+ 1 - 1
src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayMicroPayRequest.cs

@@ -120,7 +120,7 @@ namespace Essensoft.Paylink.WeChatPay.V2.Request
             return parameters;
         }
 
-        public void PrimaryHandler(WeChatPayOptions options, WeChatPaySignType signType, WeChatPayDictionary sortedTxtParams)
+        public void PrimaryHandler(WeChatPayDictionary sortedTxtParams, WeChatPaySignType signType, WeChatPayOptions options)
         {
             sortedTxtParams.Add(WeChatPayConsts.nonce_str, WeChatPayUtility.GenerateNonceStr());
             sortedTxtParams.Add(WeChatPayConsts.appid, options.AppId);

+ 1 - 1
src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayMiniProgramReceiveRedPacketSdkRequest.cs

@@ -23,7 +23,7 @@ namespace Essensoft.Paylink.WeChatPay.V2.Request
             return parameters;
         }
 
-        public void PrimaryHandler(WeChatPayOptions options, WeChatPayDictionary sortedTxtParams)
+        public void PrimaryHandler(WeChatPayDictionary sortedTxtParams, WeChatPayOptions options)
         {
             sortedTxtParams.Add(WeChatPayConsts.timeStamp, WeChatPayUtility.GetTimeStamp());
             sortedTxtParams.Add(WeChatPayConsts.nonceStr, WeChatPayUtility.GenerateNonceStr());

+ 1 - 1
src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayMiniProgramSdkRequest.cs

@@ -23,7 +23,7 @@ namespace Essensoft.Paylink.WeChatPay.V2.Request
             return parameters;
         }
 
-        public void PrimaryHandler(WeChatPayOptions options, WeChatPayDictionary sortedTxtParams)
+        public void PrimaryHandler(WeChatPayDictionary sortedTxtParams, WeChatPayOptions options)
         {
             sortedTxtParams.Add(WeChatPayConsts.timeStamp, WeChatPayUtility.GetTimeStamp());
             sortedTxtParams.Add(WeChatPayConsts.nonceStr, WeChatPayUtility.GenerateNonceStr());

+ 1 - 1
src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayMultiProfitSharingRequest.cs

@@ -53,7 +53,7 @@ namespace Essensoft.Paylink.WeChatPay.V2.Request
             return WeChatPaySignType.HMAC_SHA256;
         }
 
-        public void PrimaryHandler(WeChatPayOptions options, WeChatPaySignType signType, WeChatPayDictionary sortedTxtParams)
+        public void PrimaryHandler(WeChatPayDictionary sortedTxtParams, WeChatPaySignType signType, WeChatPayOptions options)
         {
             sortedTxtParams.Add(WeChatPayConsts.nonce_str, WeChatPayUtility.GenerateNonceStr());
             sortedTxtParams.Add(WeChatPayConsts.appid, options.AppId);

+ 1 - 1
src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayOrderQueryRequest.cs

@@ -42,7 +42,7 @@ namespace Essensoft.Paylink.WeChatPay.V2.Request
             return parameters;
         }
 
-        public void PrimaryHandler(WeChatPayOptions options, WeChatPaySignType signType, WeChatPayDictionary sortedTxtParams)
+        public void PrimaryHandler(WeChatPayDictionary sortedTxtParams, WeChatPaySignType signType, WeChatPayOptions options)
         {
             sortedTxtParams.Add(WeChatPayConsts.nonce_str, WeChatPayUtility.GenerateNonceStr());
             sortedTxtParams.Add(WeChatPayConsts.appid, options.AppId);

+ 1 - 1
src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayPaPayPartnerDeleteContractRequest.cs

@@ -60,7 +60,7 @@ namespace Essensoft.Paylink.WeChatPay.V2.Request
             return parameters;
         }
 
-        public void PrimaryHandler(WeChatPayOptions options, WeChatPaySignType signType, WeChatPayDictionary sortedTxtParams)
+        public void PrimaryHandler(WeChatPayDictionary sortedTxtParams, WeChatPaySignType signType, WeChatPayOptions options)
         {
             sortedTxtParams.Add(WeChatPayConsts.nonce_str, WeChatPayUtility.GenerateNonceStr());
             sortedTxtParams.Add(WeChatPayConsts.appid, options.AppId);

+ 1 - 1
src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayPaPayPartnerEntrustWebRequest.cs

@@ -72,7 +72,7 @@ namespace Essensoft.Paylink.WeChatPay.V2.Request
             return parameters;
         }
 
-        public void PrimaryHandler(WeChatPayOptions options, WeChatPaySignType signType, WeChatPayDictionary sortedTxtParams)
+        public void PrimaryHandler(WeChatPayDictionary sortedTxtParams, WeChatPaySignType signType, WeChatPayOptions options)
         {
             sortedTxtParams.Add(WeChatPayConsts.nonce_str, WeChatPayUtility.GenerateNonceStr());
             sortedTxtParams.Add(WeChatPayConsts.appid, options.AppId);

+ 1 - 1
src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayPaPayPartnerH5EntrustWebRequest.cs

@@ -124,7 +124,7 @@ namespace Essensoft.Paylink.WeChatPay.V2.Request
             return WeChatPaySignType.HMAC_SHA256;
         }
 
-        public void PrimaryHandler(WeChatPayOptions options, WeChatPaySignType signType, WeChatPayDictionary sortedTxtParams)
+        public void PrimaryHandler(WeChatPayDictionary sortedTxtParams, WeChatPaySignType signType, WeChatPayOptions options)
         {
             sortedTxtParams.Add(WeChatPayConsts.nonce_str, WeChatPayUtility.GenerateNonceStr());
             sortedTxtParams.Add(WeChatPayConsts.appid, options.AppId);

+ 1 - 1
src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayPaPayPartnerQueryContractRequest.cs

@@ -54,7 +54,7 @@ namespace Essensoft.Paylink.WeChatPay.V2.Request
             return parameters;
         }
 
-        public void PrimaryHandler(WeChatPayOptions options, WeChatPaySignType signType, WeChatPayDictionary sortedTxtParams)
+        public void PrimaryHandler(WeChatPayDictionary sortedTxtParams, WeChatPaySignType signType, WeChatPayOptions options)
         {
             sortedTxtParams.Add(WeChatPayConsts.nonce_str, WeChatPayUtility.GenerateNonceStr());
             sortedTxtParams.Add(WeChatPayConsts.appid, options.AppId);

+ 1 - 1
src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayPartnerPapOrderQueryRequest.cs

@@ -42,7 +42,7 @@ namespace Essensoft.Paylink.WeChatPay.V2.Request
             return parameters;
         }
 
-        public void PrimaryHandler(WeChatPayOptions options, WeChatPaySignType signType, WeChatPayDictionary sortedTxtParams)
+        public void PrimaryHandler(WeChatPayDictionary sortedTxtParams, WeChatPaySignType signType, WeChatPayOptions options)
         {
             sortedTxtParams.Add(WeChatPayConsts.nonce_str, WeChatPayUtility.GenerateNonceStr());
             sortedTxtParams.Add(WeChatPayConsts.appid, options.AppId);

+ 1 - 1
src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayPartnerPapPayApplyRequest.cs

@@ -108,7 +108,7 @@ namespace Essensoft.Paylink.WeChatPay.V2.Request
             return parameters;
         }
 
-        public void PrimaryHandler(WeChatPayOptions options, WeChatPaySignType signType, WeChatPayDictionary sortedTxtParams)
+        public void PrimaryHandler(WeChatPayDictionary sortedTxtParams, WeChatPaySignType signType, WeChatPayOptions options)
         {
             sortedTxtParams.Add(WeChatPayConsts.nonce_str, WeChatPayUtility.GenerateNonceStr());
             sortedTxtParams.Add(WeChatPayConsts.appid, options.AppId);

+ 1 - 1
src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayPayBankRequest.cs

@@ -65,7 +65,7 @@ namespace Essensoft.Paylink.WeChatPay.V2.Request
             return parameters;
         }
 
-        public void PrimaryHandler(WeChatPayOptions options, WeChatPaySignType signType, WeChatPayDictionary sortedTxtParams)
+        public void PrimaryHandler(WeChatPayDictionary sortedTxtParams, WeChatPaySignType signType, WeChatPayOptions options)
         {
             if (string.IsNullOrEmpty(options.RsaPublicKey))
             {

+ 1 - 1
src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayPayitilReportRequest.cs

@@ -96,7 +96,7 @@ namespace Essensoft.Paylink.WeChatPay.V2.Request
             return parameters;
         }
 
-        public void PrimaryHandler(WeChatPayOptions options, WeChatPaySignType signType, WeChatPayDictionary sortedTxtParams)
+        public void PrimaryHandler(WeChatPayDictionary sortedTxtParams, WeChatPaySignType signType, WeChatPayOptions options)
         {
             sortedTxtParams.Add(WeChatPayConsts.nonce_str, WeChatPayUtility.GenerateNonceStr());
             sortedTxtParams.Add(WeChatPayConsts.appid, options.AppId);

+ 1 - 1
src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayProfitSharingAddReceiverRequest.cs

@@ -41,7 +41,7 @@ namespace Essensoft.Paylink.WeChatPay.V2.Request
             return WeChatPaySignType.HMAC_SHA256;
         }
 
-        public void PrimaryHandler(WeChatPayOptions options, WeChatPaySignType signType, WeChatPayDictionary sortedTxtParams)
+        public void PrimaryHandler(WeChatPayDictionary sortedTxtParams, WeChatPaySignType signType, WeChatPayOptions options)
         {
             sortedTxtParams.Add(WeChatPayConsts.nonce_str, WeChatPayUtility.GenerateNonceStr());
             sortedTxtParams.Add(WeChatPayConsts.appid, options.AppId);

+ 1 - 1
src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayProfitSharingFinishRequest.cs

@@ -53,7 +53,7 @@ namespace Essensoft.Paylink.WeChatPay.V2.Request
             return WeChatPaySignType.HMAC_SHA256;
         }
 
-        public void PrimaryHandler(WeChatPayOptions options, WeChatPaySignType signType, WeChatPayDictionary sortedTxtParams)
+        public void PrimaryHandler(WeChatPayDictionary sortedTxtParams, WeChatPaySignType signType, WeChatPayOptions options)
         {
             sortedTxtParams.Add(WeChatPayConsts.nonce_str, WeChatPayUtility.GenerateNonceStr());
             sortedTxtParams.Add(WeChatPayConsts.appid, options.AppId);

+ 1 - 1
src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayProfitSharingMerchantRatioQueryRequest.cs

@@ -41,7 +41,7 @@ namespace Essensoft.Paylink.WeChatPay.V2.Request
             return WeChatPaySignType.HMAC_SHA256;
         }
 
-        public void PrimaryHandler(WeChatPayOptions options, WeChatPaySignType signType, WeChatPayDictionary sortedTxtParams)
+        public void PrimaryHandler(WeChatPayDictionary sortedTxtParams, WeChatPaySignType signType, WeChatPayOptions options)
         {
             sortedTxtParams.Add(WeChatPayConsts.nonce_str, WeChatPayUtility.GenerateNonceStr());
             sortedTxtParams.Add(WeChatPayConsts.mch_id, options.MchId);

+ 1 - 1
src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayProfitSharingOrderAmountQueryRequest.cs

@@ -41,7 +41,7 @@ namespace Essensoft.Paylink.WeChatPay.V2.Request
             return WeChatPaySignType.HMAC_SHA256;
         }
 
-        public void PrimaryHandler(WeChatPayOptions options, WeChatPaySignType signType, WeChatPayDictionary sortedTxtParams)
+        public void PrimaryHandler(WeChatPayDictionary sortedTxtParams, WeChatPaySignType signType, WeChatPayOptions options)
         {
             sortedTxtParams.Add(WeChatPayConsts.nonce_str, WeChatPayUtility.GenerateNonceStr());
             sortedTxtParams.Add(WeChatPayConsts.mch_id, options.MchId);

+ 1 - 1
src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayProfitSharingQueryRequest.cs

@@ -47,7 +47,7 @@ namespace Essensoft.Paylink.WeChatPay.V2.Request
             return WeChatPaySignType.HMAC_SHA256;
         }
 
-        public void PrimaryHandler(WeChatPayOptions options, WeChatPaySignType signType, WeChatPayDictionary sortedTxtParams)
+        public void PrimaryHandler(WeChatPayDictionary sortedTxtParams, WeChatPaySignType signType, WeChatPayOptions options)
         {
             sortedTxtParams.Add(WeChatPayConsts.nonce_str, WeChatPayUtility.GenerateNonceStr());
             sortedTxtParams.Add(WeChatPayConsts.mch_id, options.MchId);

+ 1 - 1
src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayProfitSharingRemoveReceiverRequest.cs

@@ -41,7 +41,7 @@ namespace Essensoft.Paylink.WeChatPay.V2.Request
             return WeChatPaySignType.HMAC_SHA256;
         }
 
-        public void PrimaryHandler(WeChatPayOptions options, WeChatPaySignType signType, WeChatPayDictionary sortedTxtParams)
+        public void PrimaryHandler(WeChatPayDictionary sortedTxtParams, WeChatPaySignType signType, WeChatPayOptions options)
         {
             sortedTxtParams.Add(WeChatPayConsts.nonce_str, WeChatPayUtility.GenerateNonceStr());
             sortedTxtParams.Add(WeChatPayConsts.appid, options.AppId);

+ 1 - 1
src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayProfitSharingRequest.cs

@@ -59,7 +59,7 @@ namespace Essensoft.Paylink.WeChatPay.V2.Request
             return WeChatPaySignType.HMAC_SHA256;
         }
 
-        public void PrimaryHandler(WeChatPayOptions options, WeChatPaySignType signType, WeChatPayDictionary sortedTxtParams)
+        public void PrimaryHandler(WeChatPayDictionary sortedTxtParams, WeChatPaySignType signType, WeChatPayOptions options)
         {
             sortedTxtParams.Add(WeChatPayConsts.nonce_str, WeChatPayUtility.GenerateNonceStr());
             sortedTxtParams.Add(WeChatPayConsts.appid, options.AppId);

+ 1 - 1
src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayProfitSharingReturnQueryRequest.cs

@@ -53,7 +53,7 @@ namespace Essensoft.Paylink.WeChatPay.V2.Request
             return WeChatPaySignType.HMAC_SHA256;
         }
 
-        public void PrimaryHandler(WeChatPayOptions options, WeChatPaySignType signType, WeChatPayDictionary sortedTxtParams)
+        public void PrimaryHandler(WeChatPayDictionary sortedTxtParams, WeChatPaySignType signType, WeChatPayOptions options)
         {
             sortedTxtParams.Add(WeChatPayConsts.nonce_str, WeChatPayUtility.GenerateNonceStr());
             sortedTxtParams.Add(WeChatPayConsts.appid, options.AppId);

+ 1 - 1
src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayProfitSharingReturnRequest.cs

@@ -77,7 +77,7 @@ namespace Essensoft.Paylink.WeChatPay.V2.Request
             return WeChatPaySignType.HMAC_SHA256;
         }
 
-        public void PrimaryHandler(WeChatPayOptions options, WeChatPaySignType signType, WeChatPayDictionary sortedTxtParams)
+        public void PrimaryHandler(WeChatPayDictionary sortedTxtParams, WeChatPaySignType signType, WeChatPayOptions options)
         {
             sortedTxtParams.Add(WeChatPayConsts.nonce_str, WeChatPayUtility.GenerateNonceStr());
             sortedTxtParams.Add(WeChatPayConsts.appid, options.AppId);

+ 1 - 1
src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayPromotionPayWwSpTrans2PockeRequest.cs

@@ -108,7 +108,7 @@ namespace Essensoft.Paylink.WeChatPay.V2.Request
             return parameters;
         }
 
-        public void PrimaryHandler(WeChatPayOptions options, WeChatPaySignType signType, WeChatPayDictionary sortedTxtParams)
+        public void PrimaryHandler(WeChatPayDictionary sortedTxtParams, WeChatPaySignType signType, WeChatPayOptions options)
         {
             sortedTxtParams.Add(WeChatPayConsts.nonce_str, WeChatPayUtility.GenerateNonceStr());
             sortedTxtParams.Add(WeChatPayConsts.appid, options.AppId);

+ 1 - 1
src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayPromotionQueryWwSpTrans2PockeRequest.cs

@@ -36,7 +36,7 @@ namespace Essensoft.Paylink.WeChatPay.V2.Request
             return parameters;
         }
 
-        public void PrimaryHandler(WeChatPayOptions options, WeChatPaySignType signType, WeChatPayDictionary sortedTxtParams)
+        public void PrimaryHandler(WeChatPayDictionary sortedTxtParams, WeChatPaySignType signType, WeChatPayOptions options)
         {
             sortedTxtParams.Add(WeChatPayConsts.nonce_str, WeChatPayUtility.GenerateNonceStr());
             sortedTxtParams.Add(WeChatPayConsts.appid, options.AppId);

+ 1 - 1
src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayPromotionTransfersRequest.cs

@@ -78,7 +78,7 @@ namespace Essensoft.Paylink.WeChatPay.V2.Request
             return parameters;
         }
 
-        public void PrimaryHandler(WeChatPayOptions options, WeChatPaySignType signType, WeChatPayDictionary sortedTxtParams)
+        public void PrimaryHandler(WeChatPayDictionary sortedTxtParams, WeChatPaySignType signType, WeChatPayOptions options)
         {
             sortedTxtParams.Add(WeChatPayConsts.nonce_str, WeChatPayUtility.GenerateNonceStr());
             sortedTxtParams.Add(WeChatPayConsts.mch_appid, options.AppId);

+ 1 - 1
src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayQueryBankRequest.cs

@@ -36,7 +36,7 @@ namespace Essensoft.Paylink.WeChatPay.V2.Request
             return parameters;
         }
 
-        public void PrimaryHandler(WeChatPayOptions options, WeChatPaySignType signType, WeChatPayDictionary sortedTxtParams)
+        public void PrimaryHandler(WeChatPayDictionary sortedTxtParams, WeChatPaySignType signType, WeChatPayOptions options)
         {
             sortedTxtParams.Add(WeChatPayConsts.nonce_str, WeChatPayUtility.GenerateNonceStr());
             sortedTxtParams.Add(WeChatPayConsts.mch_id, options.MchId);

+ 1 - 1
src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayQueryCouponStockRequest.cs

@@ -60,7 +60,7 @@ namespace Essensoft.Paylink.WeChatPay.V2.Request
             return parameters;
         }
 
-        public void PrimaryHandler(WeChatPayOptions options, WeChatPaySignType signType, WeChatPayDictionary sortedTxtParams)
+        public void PrimaryHandler(WeChatPayDictionary sortedTxtParams, WeChatPaySignType signType, WeChatPayOptions options)
         {
             sortedTxtParams.Add(WeChatPayConsts.nonce_str, WeChatPayUtility.GenerateNonceStr());
             sortedTxtParams.Add(WeChatPayConsts.appid, options.AppId);

+ 1 - 1
src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayQueryCouponsInfoRequest.cs

@@ -72,7 +72,7 @@ namespace Essensoft.Paylink.WeChatPay.V2.Request
             return parameters;
         }
 
-        public void PrimaryHandler(WeChatPayOptions options, WeChatPaySignType signType, WeChatPayDictionary sortedTxtParams)
+        public void PrimaryHandler(WeChatPayDictionary sortedTxtParams, WeChatPaySignType signType, WeChatPayOptions options)
         {
             sortedTxtParams.Add(WeChatPayConsts.nonce_str, WeChatPayUtility.GenerateNonceStr());
             sortedTxtParams.Add(WeChatPayConsts.appid, options.AppId);

+ 1 - 1
src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayQueryWorkWxRedPackRequest.cs

@@ -36,7 +36,7 @@ namespace Essensoft.Paylink.WeChatPay.V2.Request
             return parameters;
         }
 
-        public void PrimaryHandler(WeChatPayOptions options, WeChatPaySignType signType, WeChatPayDictionary sortedTxtParams)
+        public void PrimaryHandler(WeChatPayDictionary sortedTxtParams, WeChatPaySignType signType, WeChatPayOptions options)
         {
             sortedTxtParams.Add(WeChatPayConsts.nonce_str, WeChatPayUtility.GenerateNonceStr());
             sortedTxtParams.Add(WeChatPayConsts.appid, options.AppId);

+ 1 - 1
src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayRefundQueryRequest.cs

@@ -60,7 +60,7 @@ namespace Essensoft.Paylink.WeChatPay.V2.Request
             return parameters;
         }
 
-        public void PrimaryHandler(WeChatPayOptions options, WeChatPaySignType signType, WeChatPayDictionary sortedTxtParams)
+        public void PrimaryHandler(WeChatPayDictionary sortedTxtParams, WeChatPaySignType signType, WeChatPayOptions options)
         {
             sortedTxtParams.Add(WeChatPayConsts.nonce_str, WeChatPayUtility.GenerateNonceStr());
             sortedTxtParams.Add(WeChatPayConsts.appid, options.AppId);

+ 1 - 1
src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayRefundRequest.cs

@@ -84,7 +84,7 @@ namespace Essensoft.Paylink.WeChatPay.V2.Request
             return parameters;
         }
 
-        public void PrimaryHandler(WeChatPayOptions options, WeChatPaySignType signType, WeChatPayDictionary sortedTxtParams)
+        public void PrimaryHandler(WeChatPayDictionary sortedTxtParams, WeChatPaySignType signType, WeChatPayOptions options)
         {
             sortedTxtParams.Add(WeChatPayConsts.nonce_str, WeChatPayUtility.GenerateNonceStr());
             sortedTxtParams.Add(WeChatPayConsts.appid, options.AppId);

+ 1 - 1
src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayReverseRequest.cs

@@ -42,7 +42,7 @@ namespace Essensoft.Paylink.WeChatPay.V2.Request
             return parameters;
         }
 
-        public void PrimaryHandler(WeChatPayOptions options, WeChatPaySignType signType, WeChatPayDictionary sortedTxtParams)
+        public void PrimaryHandler(WeChatPayDictionary sortedTxtParams, WeChatPaySignType signType, WeChatPayOptions options)
         {
             sortedTxtParams.Add(WeChatPayConsts.nonce_str, WeChatPayUtility.GenerateNonceStr());
             sortedTxtParams.Add(WeChatPayConsts.appid, options.AppId);

+ 1 - 1
src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayRiskGetPublicKeyRequest.cs

@@ -30,7 +30,7 @@ namespace Essensoft.Paylink.WeChatPay.V2.Request
             return parameters;
         }
 
-        public void PrimaryHandler(WeChatPayOptions options, WeChatPaySignType signType, WeChatPayDictionary sortedTxtParams)
+        public void PrimaryHandler(WeChatPayDictionary sortedTxtParams, WeChatPaySignType signType, WeChatPayOptions options)
         {
             sortedTxtParams.Add(WeChatPayConsts.nonce_str, WeChatPayUtility.GenerateNonceStr());
             sortedTxtParams.Add(WeChatPayConsts.mch_id, options.MchId);

+ 1 - 1
src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPaySendCouponRequest.cs

@@ -78,7 +78,7 @@ namespace Essensoft.Paylink.WeChatPay.V2.Request
             return parameters;
         }
 
-        public void PrimaryHandler(WeChatPayOptions options, WeChatPaySignType signType, WeChatPayDictionary sortedTxtParams)
+        public void PrimaryHandler(WeChatPayDictionary sortedTxtParams, WeChatPaySignType signType, WeChatPayOptions options)
         {
             sortedTxtParams.Add(WeChatPayConsts.nonce_str, WeChatPayUtility.GenerateNonceStr());
             sortedTxtParams.Add(WeChatPayConsts.appid, options.AppId);

+ 1 - 1
src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPaySendGroupRedPackRequest.cs

@@ -102,7 +102,7 @@ namespace Essensoft.Paylink.WeChatPay.V2.Request
             return parameters;
         }
 
-        public void PrimaryHandler(WeChatPayOptions options, WeChatPaySignType signType, WeChatPayDictionary sortedTxtParams)
+        public void PrimaryHandler(WeChatPayDictionary sortedTxtParams, WeChatPaySignType signType, WeChatPayOptions options)
         {
             sortedTxtParams.Add(WeChatPayConsts.nonce_str, WeChatPayUtility.GenerateNonceStr());
             sortedTxtParams.Add(WeChatPayConsts.wxappid, options.AppId);

+ 1 - 1
src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPaySendMiniProgramHbRequest.cs

@@ -107,7 +107,7 @@ namespace Essensoft.Paylink.WeChatPay.V2.Request
             return parameters;
         }
 
-        public void PrimaryHandler(WeChatPayOptions options, WeChatPaySignType signType, WeChatPayDictionary sortedTxtParams)
+        public void PrimaryHandler(WeChatPayDictionary sortedTxtParams, WeChatPaySignType signType, WeChatPayOptions options)
         {
             sortedTxtParams.Add(WeChatPayConsts.nonce_str, WeChatPayUtility.GenerateNonceStr());
             sortedTxtParams.Add(WeChatPayConsts.appid, options.AppId);

+ 1 - 1
src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPaySendRedPackRequest.cs

@@ -102,7 +102,7 @@ namespace Essensoft.Paylink.WeChatPay.V2.Request
             return parameters;
         }
 
-        public void PrimaryHandler(WeChatPayOptions options, WeChatPaySignType signType, WeChatPayDictionary sortedTxtParams)
+        public void PrimaryHandler(WeChatPayDictionary sortedTxtParams, WeChatPaySignType signType, WeChatPayOptions options)
         {
             sortedTxtParams.Add(WeChatPayConsts.nonce_str, WeChatPayUtility.GenerateNonceStr());
             sortedTxtParams.Add(WeChatPayConsts.wxappid, options.AppId);

+ 1 - 1
src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPaySendWorkWxRedPackRequest.cs

@@ -90,7 +90,7 @@ namespace Essensoft.Paylink.WeChatPay.V2.Request
             return parameters;
         }
 
-        public void PrimaryHandler(WeChatPayOptions options, WeChatPaySignType signType, WeChatPayDictionary sortedTxtParams)
+        public void PrimaryHandler(WeChatPayDictionary sortedTxtParams, WeChatPaySignType signType, WeChatPayOptions options)
         {
             sortedTxtParams.Add(WeChatPayConsts.nonce_str, WeChatPayUtility.GenerateNonceStr());
             sortedTxtParams.Add(WeChatPayConsts.wxappid, options.AppId);

+ 1 - 1
src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayToolsAuthCodeToOpenIdRequest.cs

@@ -36,7 +36,7 @@ namespace Essensoft.Paylink.WeChatPay.V2.Request
             return parameters;
         }
 
-        public void PrimaryHandler(WeChatPayOptions options, WeChatPaySignType signType, WeChatPayDictionary sortedTxtParams)
+        public void PrimaryHandler(WeChatPayDictionary sortedTxtParams, WeChatPaySignType signType, WeChatPayOptions options)
         {
             sortedTxtParams.Add(WeChatPayConsts.nonce_str, WeChatPayUtility.GenerateNonceStr());
             sortedTxtParams.Add(WeChatPayConsts.appid, options.AppId);

+ 1 - 1
src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayToolsShortUrlRequest.cs

@@ -36,7 +36,7 @@ namespace Essensoft.Paylink.WeChatPay.V2.Request
             return parameters;
         }
 
-        public void PrimaryHandler(WeChatPayOptions options, WeChatPaySignType signType, WeChatPayDictionary sortedTxtParams)
+        public void PrimaryHandler(WeChatPayDictionary sortedTxtParams, WeChatPaySignType signType, WeChatPayOptions options)
         {
             sortedTxtParams.Add(WeChatPayConsts.nonce_str, WeChatPayUtility.GenerateNonceStr());
             sortedTxtParams.Add(WeChatPayConsts.appid, options.AppId);

+ 1 - 1
src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayTransitPartnerPayPayApplyRequest.cs

@@ -119,7 +119,7 @@ namespace Essensoft.Paylink.WeChatPay.V2.Request
             return WeChatPaySignType.HMAC_SHA256;
         }
 
-        public void PrimaryHandler(WeChatPayOptions options, WeChatPaySignType signType, WeChatPayDictionary sortedTxtParams)
+        public void PrimaryHandler(WeChatPayDictionary sortedTxtParams, WeChatPaySignType signType, WeChatPayOptions options)
         {
             sortedTxtParams.Add(WeChatPayConsts.nonce_str, WeChatPayUtility.GenerateNonceStr());
             sortedTxtParams.Add(WeChatPayConsts.appid, options.AppId);

+ 1 - 1
src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayTransitPartnerPayQueryOrderRequest.cs

@@ -53,7 +53,7 @@ namespace Essensoft.Paylink.WeChatPay.V2.Request
             return WeChatPaySignType.HMAC_SHA256;
         }
 
-        public void PrimaryHandler(WeChatPayOptions options, WeChatPaySignType signType, WeChatPayDictionary sortedTxtParams)
+        public void PrimaryHandler(WeChatPayDictionary sortedTxtParams, WeChatPaySignType signType, WeChatPayOptions options)
         {
             sortedTxtParams.Add(WeChatPayConsts.nonce_str, WeChatPayUtility.GenerateNonceStr());
             sortedTxtParams.Add(WeChatPayConsts.appid, options.AppId);

+ 1 - 1
src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayTransitPartnerPayQueryStateRequest.cs

@@ -47,7 +47,7 @@ namespace Essensoft.Paylink.WeChatPay.V2.Request
             return WeChatPaySignType.HMAC_SHA256;
         }
 
-        public void PrimaryHandler(WeChatPayOptions options, WeChatPaySignType signType, WeChatPayDictionary sortedTxtParams)
+        public void PrimaryHandler(WeChatPayDictionary sortedTxtParams, WeChatPaySignType signType, WeChatPayOptions options)
         {
             sortedTxtParams.Add(WeChatPayConsts.nonce_str, WeChatPayUtility.GenerateNonceStr());
             sortedTxtParams.Add(WeChatPayConsts.appid, options.AppId);

+ 1 - 1
src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayUnifiedOrderRequest.cs

@@ -151,7 +151,7 @@ namespace Essensoft.Paylink.WeChatPay.V2.Request
             return parameters;
         }
 
-        public void PrimaryHandler(WeChatPayOptions options, WeChatPaySignType signType, WeChatPayDictionary sortedTxtParams)
+        public void PrimaryHandler(WeChatPayDictionary sortedTxtParams, WeChatPaySignType signType, WeChatPayOptions options)
         {
             sortedTxtParams.Add(WeChatPayConsts.nonce_str, WeChatPayUtility.GenerateNonceStr());
             sortedTxtParams.Add(WeChatPayConsts.appid, options.AppId);

+ 1 - 1
src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayVehiclePartnerPayNotificationRequest.cs

@@ -53,7 +53,7 @@ namespace Essensoft.Paylink.WeChatPay.V2.Request
             return WeChatPaySignType.HMAC_SHA256;
         }
 
-        public void PrimaryHandler(WeChatPayOptions options, WeChatPaySignType signType, WeChatPayDictionary sortedTxtParams)
+        public void PrimaryHandler(WeChatPayDictionary sortedTxtParams, WeChatPaySignType signType, WeChatPayOptions options)
         {
             sortedTxtParams.Add(WeChatPayConsts.nonce_str, WeChatPayUtility.GenerateNonceStr());
             sortedTxtParams.Add(WeChatPayConsts.appid, options.AppId);

+ 1 - 1
src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayVehiclePartnerPayPayApplyRequest.cs

@@ -119,7 +119,7 @@ namespace Essensoft.Paylink.WeChatPay.V2.Request
             return WeChatPaySignType.HMAC_SHA256;
         }
 
-        public void PrimaryHandler(WeChatPayOptions options, WeChatPaySignType signType, WeChatPayDictionary sortedTxtParams)
+        public void PrimaryHandler(WeChatPayDictionary sortedTxtParams, WeChatPaySignType signType, WeChatPayOptions options)
         {
             sortedTxtParams.Add(WeChatPayConsts.nonce_str, WeChatPayUtility.GenerateNonceStr());
             sortedTxtParams.Add(WeChatPayConsts.appid, options.AppId);

+ 1 - 1
src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayVehiclePartnerPayQueryStateRequest.cs

@@ -71,7 +71,7 @@ namespace Essensoft.Paylink.WeChatPay.V2.Request
             return WeChatPaySignType.HMAC_SHA256;
         }
 
-        public void PrimaryHandler(WeChatPayOptions options, WeChatPaySignType signType, WeChatPayDictionary sortedTxtParams)
+        public void PrimaryHandler(WeChatPayDictionary sortedTxtParams, WeChatPaySignType signType, WeChatPayOptions options)
         {
             sortedTxtParams.Add(WeChatPayConsts.nonce_str, WeChatPayUtility.GenerateNonceStr());
             sortedTxtParams.Add(WeChatPayConsts.appid, options.AppId);

+ 1 - 1
src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayVehiclePayNotificationRequest.cs

@@ -53,7 +53,7 @@ namespace Essensoft.Paylink.WeChatPay.V2.Request
             return WeChatPaySignType.HMAC_SHA256;
         }
 
-        public void PrimaryHandler(WeChatPayOptions options, WeChatPaySignType signType, WeChatPayDictionary sortedTxtParams)
+        public void PrimaryHandler(WeChatPayDictionary sortedTxtParams, WeChatPaySignType signType, WeChatPayOptions options)
         {
             sortedTxtParams.Add(WeChatPayConsts.nonce_str, WeChatPayUtility.GenerateNonceStr());
             sortedTxtParams.Add(WeChatPayConsts.appid, options.AppId);

+ 1 - 1
src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayVehiclePayPayApplyRequest.cs

@@ -114,7 +114,7 @@ namespace Essensoft.Paylink.WeChatPay.V2.Request
             return WeChatPaySignType.HMAC_SHA256;
         }
 
-        public void PrimaryHandler(WeChatPayOptions options, WeChatPaySignType signType, WeChatPayDictionary sortedTxtParams)
+        public void PrimaryHandler(WeChatPayDictionary sortedTxtParams, WeChatPaySignType signType, WeChatPayOptions options)
         {
             sortedTxtParams.Add(WeChatPayConsts.nonce_str, WeChatPayUtility.GenerateNonceStr());
             sortedTxtParams.Add(WeChatPayConsts.appid, options.AppId);

+ 1 - 1
src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayVehiclePayQueryStateRequest.cs

@@ -71,7 +71,7 @@ namespace Essensoft.Paylink.WeChatPay.V2.Request
             return WeChatPaySignType.HMAC_SHA256;
         }
 
-        public void PrimaryHandler(WeChatPayOptions options, WeChatPaySignType signType, WeChatPayDictionary sortedTxtParams)
+        public void PrimaryHandler(WeChatPayDictionary sortedTxtParams, WeChatPaySignType signType, WeChatPayOptions options)
         {
             sortedTxtParams.Add(WeChatPayConsts.nonce_str, WeChatPayUtility.GenerateNonceStr());
             sortedTxtParams.Add(WeChatPayConsts.appid, options.AppId);

+ 4 - 4
src/Essensoft.Paylink.WeChatPay/V2/WeChatPayClient.cs

@@ -51,7 +51,7 @@ namespace Essensoft.Paylink.WeChatPay.V2
             var signType = request.GetSignType();
             var sortedTxtParams = new WeChatPayDictionary(request.GetParameters());
 
-            request.PrimaryHandler(options, signType, sortedTxtParams);
+            request.PrimaryHandler(sortedTxtParams, signType, options);
 
             var client = _httpClientFactory.CreateClient(Name);
             var body = await client.PostAsync(request, sortedTxtParams);
@@ -95,7 +95,7 @@ namespace Essensoft.Paylink.WeChatPay.V2
             var signType = request.GetSignType();
             var sortedTxtParams = new WeChatPayDictionary(request.GetParameters());
 
-            request.PrimaryHandler(options, signType, sortedTxtParams);
+            request.PrimaryHandler(sortedTxtParams, signType, options);
 
             var url = request.GetRequestUrl();
             if (url.Contains("?"))
@@ -146,7 +146,7 @@ namespace Essensoft.Paylink.WeChatPay.V2
             var signType = request.GetSignType();
             var sortedTxtParams = new WeChatPayDictionary(request.GetParameters());
 
-            request.PrimaryHandler(options, signType, sortedTxtParams);
+            request.PrimaryHandler(sortedTxtParams, signType, options);
 
             if (!_clientCertificateManager.ContainsKey(options.CertificateSerialNo))
             {
@@ -194,7 +194,7 @@ namespace Essensoft.Paylink.WeChatPay.V2
 
             var sortedTxtParams = new WeChatPayDictionary(request.GetParameters());
 
-            request.PrimaryHandler(options, sortedTxtParams);
+            request.PrimaryHandler(sortedTxtParams, options);
 
             return Task.FromResult(sortedTxtParams);
         }

+ 4 - 4
src/Essensoft.Paylink.WeChatPay/V3/IWeChatPaySdkRequest.cs

@@ -13,10 +13,10 @@ namespace Essensoft.Paylink.WeChatPay.V3
         IDictionary<string, string> GetParameters();
 
         /// <summary>
-        /// 请求参数处理器
+        /// 参数处理器
         /// </summary>
-        /// <param name="options"></param>
-        /// <param name="sortedTxtParams"></param>
-        void PrimaryHandler(WeChatPayOptions options, WeChatPayDictionary sortedTxtParams);
+        /// <param name="sortedTxtParams">排序文本参数</param>
+        /// <param name="options">配置选项</param>
+        void PrimaryHandler(WeChatPayDictionary sortedTxtParams, WeChatPayOptions options);
     }
 }

+ 1 - 1
src/Essensoft.Paylink.WeChatPay/V3/Request/WeChatPayAppSdkRequest.cs

@@ -41,7 +41,7 @@ namespace Essensoft.Paylink.WeChatPay.V3.Request
             return parameters;
         }
 
-        public void PrimaryHandler(WeChatPayOptions options, WeChatPayDictionary sortedTxtParams)
+        public void PrimaryHandler(WeChatPayDictionary sortedTxtParams, WeChatPayOptions options)
         {
             if (!string.IsNullOrEmpty(options.SubAppId) && !string.IsNullOrEmpty(options.SubMchId))
             {

+ 1 - 1
src/Essensoft.Paylink.WeChatPay/V3/Request/WeChatPayJsApiSdkRequest.cs

@@ -31,7 +31,7 @@ namespace Essensoft.Paylink.WeChatPay.V3.Request
             return parameters;
         }
 
-        public void PrimaryHandler(WeChatPayOptions options, WeChatPayDictionary sortedTxtParams)
+        public void PrimaryHandler(WeChatPayDictionary sortedTxtParams, WeChatPayOptions options)
         {
             if (!string.IsNullOrEmpty(options.SubAppId))
             {

+ 1 - 1
src/Essensoft.Paylink.WeChatPay/V3/Request/WeChatPayMiniProgramSdkRequest.cs

@@ -31,7 +31,7 @@ namespace Essensoft.Paylink.WeChatPay.V3.Request
             return parameters;
         }
 
-        public void PrimaryHandler(WeChatPayOptions options, WeChatPayDictionary sortedTxtParams)
+        public void PrimaryHandler(WeChatPayDictionary sortedTxtParams, WeChatPayOptions options)
         {
             if (!string.IsNullOrEmpty(options.SubAppId))
             {

+ 1 - 1
src/Essensoft.Paylink.WeChatPay/V3/WeChatPayClient.cs

@@ -52,7 +52,7 @@ namespace Essensoft.Paylink.WeChatPay.V3
 
             var sortedTxtParams = new WeChatPayDictionary(request.GetParameters());
 
-            request.PrimaryHandler(options, sortedTxtParams);
+            request.PrimaryHandler(sortedTxtParams, options);
 
             return Task.FromResult(sortedTxtParams);
         }