From 711646dac4ec12e9e7a3f9984c917d3de997088d Mon Sep 17 00:00:00 2001 From: Fu Diwei Date: Wed, 4 Jun 2025 20:38:15 +0800 Subject: [PATCH] =?UTF-8?q?chore(tenpayv2):=20=E6=9B=B4=E6=96=B0=E5=AE=98?= =?UTF-8?q?=E6=96=B9=E6=96=87=E6=A1=A3=E5=8F=82=E8=80=83=E9=93=BE=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/WechatTenpayV2/Basic_ModelDefinition.md | 22 +- ...enpayClientExecuteBillCommentExtensions.cs | 2 +- ...hatTenpayClientExecuteDepositExtensions.cs | 18 +- ...echatTenpayClientExecuteFraudExtensions.cs | 2 +- ...WechatTenpayClientExecuteFundExtensions.cs | 2 +- ...yClientExecuteMerchantCustomsExtensions.cs | 6 +- ...ExecuteMerchantInstitutionSubExtensions.cs | 6 +- ...payClientExecuteMerchantMediaExtensions.cs | 2 +- ...payClientExecuteMerchantMicroExtensions.cs | 4 +- .../WechatTenpayClientExecutePayExtensions.cs | 295 ++++++++++-------- ...hatTenpayClientExecutePayITILExtensions.cs | 36 +-- ...ePayMarketingTransfersRedPackExtensions.cs | 43 +-- ...PayMarketingTransfersTransferExtensions.cs | 6 +- ...utePayServicePartnerTransfersExtensions.cs | 4 +- ...WechatTenpayClientExecuteRiskExtensions.cs | 2 +- ...enpayClientExecuteSubMerchantExtensions.cs | 14 +- ...echatTenpayClientExecuteToolsExtensions.cs | 9 +- ...hatTenpayClientExecuteTransitExtensions.cs | 33 ++ ...ayClientExecuteTransitPartnerExtensions.cs | 33 ++ ...hatTenpayClientExecuteVehicleExtensions.cs | 28 +- ...ayClientExecuteVehiclePartnerExtensions.cs | 28 +- .../WechatTenpayClientExecuteXDCExtensions.cs | 13 +- .../WechatTenpayClientParameterExtensions.cs | 37 ++- ...ayMarketingTransfersGroupRedPackRequest.cs | 125 -------- ...yMarketingTransfersGroupRedPackResponse.cs | 69 ---- ...payGlobalClientExecuteCustomsExtensions.cs | 10 +- ...MarketingTransfersGroupRedPackRequest.json | 18 -- ...arketingTransfersGroupRedPackResponse.json | 12 - ...xecutePayMarketingTransfersRedPackTests.cs | 29 -- 29 files changed, 335 insertions(+), 573 deletions(-) create mode 100644 src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecuteTransitExtensions.cs create mode 100644 src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecuteTransitPartnerExtensions.cs delete mode 100644 src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PayMarketingTransfersRedPack/SendPayMarketingTransfersGroupRedPackRequest.cs delete mode 100644 src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PayMarketingTransfersRedPack/SendPayMarketingTransfersGroupRedPackResponse.cs delete mode 100644 test/SKIT.FlurlHttpClient.Wechat.TenpayV2.UnitTests/ModelSamples/PayMarketingTransfersRedPack/SendPayMarketingTransfersGroupRedPackRequest.json delete mode 100644 test/SKIT.FlurlHttpClient.Wechat.TenpayV2.UnitTests/ModelSamples/PayMarketingTransfersRedPack/SendPayMarketingTransfersGroupRedPackResponse.json delete mode 100644 test/SKIT.FlurlHttpClient.Wechat.TenpayV2.UnitTests/TestCase_ApiExecutePayMarketingTransfersRedPackTests.cs diff --git a/docs/WechatTenpayV2/Basic_ModelDefinition.md b/docs/WechatTenpayV2/Basic_ModelDefinition.md index b3c25aa7..428a9f06 100644 --- a/docs/WechatTenpayV2/Basic_ModelDefinition.md +++ b/docs/WechatTenpayV2/Basic_ModelDefinition.md @@ -61,7 +61,7 @@ ### 【附】普通商户模式 API 模型命名速查表： -注：树形结构与[微信支付开发文档](https://pay.weixin.qq.com/wiki/doc/api/index.html)目录结构保持一致。 +注：树形结构与[微信支付开发文档](https://pay.weixin.qq.com/doc/v2/merchant)目录结构保持一致。
@@ -199,8 +199,6 @@ - 发放红包：`SendPayMarketingTransfersRedPack` - - 发放裂变红包：`SendPayMarketingTransfersGroupRedPack` - - 查询红包记录：`GetPayMarketingTransfersRedPackInfo` - 小程序红包： @@ -209,12 +207,6 @@ - 查询红包记录：`GetPayMarketingTransfersRedPackInfo` - - 付款到零钱： - - - 付款：`CreatePayMarketingTransfersPromotionTransfer` - - - 查询付款：`GetPayMarketingTransfersTransferInfo` - - 付款到银行卡： - 付款到银行卡：`CreatePayServicePartnerTransfersPayToBank` @@ -223,6 +215,12 @@ - 获取 RSA 加密公钥：`GetRiskPublicKey` + - 付款到零钱： + + - 付款：`CreatePayMarketingTransfersPromotionTransfer` + + - 查询付款：`GetPayMarketingTransfersTransferInfo` + - 扣款服务： - APP 纯签约：`CreatePAPPayPreEntrustWeb` @@ -269,7 +267,7 @@ ### 【附】境内服务商模式 API 模型命名速查表： -注：树形结构与[微信支付开发文档](https://pay.weixin.qq.com/wiki/doc/api/sl.html)目录结构保持一致。 +注：树形结构与[微信支付开发文档](https://pay.weixin.qq.com/doc/v2)目录结构保持一致。
@@ -395,8 +393,6 @@ - 发放红包：`SendPayMarketingTransfersRedPack` - - 发放裂变红包：`SendPayMarketingTransfersGroupRedPack` - - 查询红包记录：`GetPayMarketingTransfersRedPackInfo` - 小程序红包： @@ -475,7 +471,7 @@ ### 【附】银行服务商模式 API 模型命名速查表： -注：树形结构与[微信支付开发文档](https://pay.weixin.qq.com/wiki/doc/api/bank.html)目录结构保持一致。 +注：树形结构与[微信支付开发文档](https://pay.weixin.qq.com/doc/v2)目录结构保持一致。
diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecuteBillCommentExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecuteBillCommentExtensions.cs index a3d48860..102cbf94 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecuteBillCommentExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecuteBillCommentExtensions.cs @@ -12,7 +12,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 /// 异步调用 [POST] /billcommentsp/batchquerycomment 接口。 /// /// REF:
- /// + /// /// /// /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecuteDepositExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecuteDepositExtensions.cs index 5ca8f90c..b4fd9e12 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecuteDepositExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecuteDepositExtensions.cs @@ -12,8 +12,8 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 /// 异步调用 [POST] /deposit/unifiedorder 接口。 /// /// REF:
- ///
- /// + ///
+ /// /// /// /// @@ -35,7 +35,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 /// 异步调用 [POST] /deposit/micropay 接口。 /// /// REF:
- /// + /// /// /// /// @@ -57,7 +57,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 /// 异步调用 [POST] /deposit/facepay 接口。 /// /// REF:
- /// + /// /// /// /// @@ -79,7 +79,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 /// 异步调用 [POST] /deposit/orderquery 接口。 /// /// REF:
- /// + /// /// /// /// @@ -101,7 +101,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 /// 异步调用 [POST] /deposit/reverse 接口。 /// /// REF:
- /// + /// /// /// /// @@ -123,7 +123,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 /// 异步调用 [POST] /deposit/consume 接口。 /// /// REF:
- /// + /// /// /// /// @@ -145,7 +145,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 /// 异步调用 [POST] /deposit/refund 接口。 /// /// REF:
- /// + /// /// /// /// @@ -167,7 +167,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 /// 异步调用 [POST] /deposit/refundquery 接口。 /// /// REF:
- /// + /// /// /// /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecuteFraudExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecuteFraudExtensions.cs index c3050a94..032bc12d 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecuteFraudExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecuteFraudExtensions.cs @@ -12,7 +12,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 /// 异步调用 [POST] /risk/getpublickey 接口。 /// /// REF:
- /// + /// /// /// （请注意此接口不受构造 时指定的 参数控制。） /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecuteFundExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecuteFundExtensions.cs index 80e937b1..f9962530 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecuteFundExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecuteFundExtensions.cs @@ -12,7 +12,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 /// 异步调用 [POST] /fund/queryautowithdrawbydate 接口。 /// /// REF:
- /// + /// /// /// /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecuteMerchantCustomsExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecuteMerchantCustomsExtensions.cs index b4ed73c6..c803e694 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecuteMerchantCustomsExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecuteMerchantCustomsExtensions.cs @@ -12,7 +12,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 /// 异步调用 [POST] /cgi-bin/mch/customs/customdeclareorder 接口。 /// /// REF:
- /// + /// /// /// /// @@ -34,7 +34,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 /// 异步调用 [POST] /cgi-bin/mch/customs/customdeclarequery 接口。 /// /// REF:
- /// + /// /// /// /// @@ -56,7 +56,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 /// 异步调用 [POST] /cgi-bin/mch/newcustoms/customdeclareredeclare 接口。 /// /// REF:
- /// + /// /// /// /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecuteMerchantInstitutionSubExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecuteMerchantInstitutionSubExtensions.cs index b9afa6f3..3b638a8f 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecuteMerchantInstitutionSubExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecuteMerchantInstitutionSubExtensions.cs @@ -12,7 +12,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 /// 异步调用 [POST] /secapi/mch/addInstitutionsub 接口。 /// /// REF:
- /// + /// /// /// /// @@ -34,7 +34,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 /// 异步调用 [POST] /secapi/mch/queryInstitutionsub 接口。 /// /// REF:
- /// + /// /// /// /// @@ -56,7 +56,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 /// 异步调用 [POST] /secapi/mch/modifyInstitutionsub 接口。 /// /// REF:
- /// + /// /// /// /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecuteMerchantMediaExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecuteMerchantMediaExtensions.cs index 7407ce45..abaf2dd1 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecuteMerchantMediaExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecuteMerchantMediaExtensions.cs @@ -18,7 +18,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 /// 异步调用 [POST] /secapi/mch/uploadmedia 接口。 /// /// REF:
- /// + /// /// /// /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecuteMerchantMicroExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecuteMerchantMicroExtensions.cs index 8ddd3829..7f0b6f96 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecuteMerchantMicroExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecuteMerchantMicroExtensions.cs @@ -12,7 +12,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 /// 异步调用 [POST] /applyment/micro/modifyarchives 接口。 /// /// REF:
- /// + /// /// /// /// @@ -34,7 +34,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 /// 异步调用 [POST] /applyment/micro/modifycontactinfo 接口。 /// /// REF:
- /// + /// /// /// /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecutePayExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecutePayExtensions.cs index cd5b9d70..0e46f7c5 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecutePayExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecutePayExtensions.cs @@ -12,21 +12,22 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 /// 异步调用 [POST] /pay/unifiedorder 接口。 /// /// REF:
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- /// + ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ /// /// /// /// @@ -48,10 +49,10 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 /// 异步调用 [POST] /pay/micropay 接口。 /// /// REF:
- ///
- ///
- ///
- /// + ///
+ ///
+ ///
+ /// /// /// /// @@ -73,24 +74,30 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 /// 异步调用 [POST] /pay/orderquery 接口。 /// /// REF:
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- /// + ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ /// /// /// /// @@ -112,8 +119,9 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 /// 异步调用 [POST] /secapi/pay/reverse 接口。 /// /// REF:
- ///
- /// + ///
+ ///
+ /// /// /// /// @@ -135,23 +143,23 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 /// 异步调用 [POST] /pay/closeorder 接口。 /// /// REF:
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- /// + ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ /// /// /// /// @@ -173,25 +181,30 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 /// 异步调用 [POST] /secapi/pay/refund 接口。 /// /// REF:
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- /// + ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ /// /// /// /// @@ -213,25 +226,29 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 /// 异步调用 [POST] /pay/refundquery 接口。 /// /// REF:
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- /// + ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ /// /// /// /// @@ -253,7 +270,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 /// 异步调用 [POST] /secapi/pay/refundv2 接口。 /// /// REF:
- /// + /// /// /// /// @@ -275,7 +292,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 /// 异步调用 [POST] /pay/refundqueryv2 接口。 /// /// REF:
- /// + /// /// /// /// @@ -298,26 +315,30 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 /// 异步调用 [POST] /pay/downloadbill 接口。 /// /// REF:
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- /// + ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ /// /// /// /// @@ -339,12 +360,18 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 /// 异步调用 [POST] /pay/downloadfundflow 接口。 /// /// REF:
- ///
- ///
- ///
- ///
- ///
- /// + ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ /// /// /// /// @@ -368,12 +395,12 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 /// 异步调用 [POST] /pay/settlementquery 接口。 /// /// REF:
- ///
- ///
- ///
- ///
- ///
- /// + ///
+ ///
+ ///
+ ///
+ ///
+ /// /// /// /// @@ -397,12 +424,12 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 /// 异步调用 [POST] /pay/queryexchagerate 接口。 /// /// REF:
- ///
- ///
- ///
- ///
- ///
- /// + ///
+ ///
+ ///
+ ///
+ ///
+ /// /// /// /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecutePayITILExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecutePayITILExtensions.cs index 1768fd0d..94ab2480 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecutePayITILExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecutePayITILExtensions.cs @@ -12,24 +12,24 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 /// 异步调用 [POST] /payitil/report 接口。 /// /// REF:
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- /// + ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ /// /// /// /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecutePayMarketingTransfersRedPackExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecutePayMarketingTransfersRedPackExtensions.cs index 5e2bdd34..407606f2 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecutePayMarketingTransfersRedPackExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecutePayMarketingTransfersRedPackExtensions.cs @@ -4,7 +4,6 @@ using System.Net.Http; using System.Threading; using System.Threading.Tasks; using Flurl.Http; -using SKIT.FlurlHttpClient.Wechat.TenpayV2.Settings; namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 { @@ -14,8 +13,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 /// 异步调用 [POST] /mmpaymkttransfers/sendredpack 接口。 /// /// REF:
- ///
- /// + /// /// /// /// @@ -33,36 +31,13 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 return await client.SendFlurlRequestAsXmlAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } - /// - /// 异步调用 [POST] /mmpaymkttransfers/sendgroupredpack 接口。 - /// - /// REF:
- ///
- /// - /// - /// - /// - /// - /// - /// - [Obsolete("相关接口或字段于 2024-06-05 下线。")] - public static async Task ExecuteSendPayMarketingTransfersGroupRedPackAsync(this WechatTenpayClient client, Models.SendPayMarketingTransfersGroupRedPackRequest request, CancellationToken cancellationToken = default) - { - if (client is null) throw new ArgumentNullException(nameof(client)); - if (request is null) throw new ArgumentNullException(nameof(request)); - - IFlurlRequest flurlReq = client - .CreateFlurlRequest(request, HttpMethod.Post, "mmpaymkttransfers", "sendgroupredpack"); - - return await client.SendFlurlRequestAsXmlAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); - } - /// /// 异步调用 [POST] /mmpaymkttransfers/sendminiprogramhb 接口。 /// /// REF:
- ///
- /// + ///
+ ///
+ /// /// /// /// @@ -84,10 +59,10 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 /// 异步调用 [POST] /mmpaymkttransfers/gethbinfo 接口。 /// /// REF:
- ///
- ///
- ///
- /// + ///
+ ///
+ ///
+ /// /// /// /// @@ -110,7 +85,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 /// 异步调用 [POST] /mmpaymkttransfers/sendworkwxredpack 接口。 /// /// REF:
- /// + /// /// /// /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecutePayMarketingTransfersTransferExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecutePayMarketingTransfersTransferExtensions.cs index 063cc53e..93b6aa0a 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecutePayMarketingTransfersTransferExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecutePayMarketingTransfersTransferExtensions.cs @@ -13,7 +13,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 /// 异步调用 [POST] /mmpaymkttransfers/promotion/transfers 接口。 /// /// REF:
- /// + /// /// /// /// @@ -35,7 +35,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 /// 异步调用 [POST] /mmpaymkttransfers/gettransferinfo 接口。 /// /// REF:
- /// + /// /// /// /// @@ -58,7 +58,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 /// 异步调用 [POST] /mmpaymkttransfers/promotion/paywwsptrans2pocket 接口。 /// /// REF:
- /// + /// /// /// /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecutePayServicePartnerTransfersExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecutePayServicePartnerTransfersExtensions.cs index ecf25a73..9ed8e518 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecutePayServicePartnerTransfersExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecutePayServicePartnerTransfersExtensions.cs @@ -12,7 +12,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 /// 异步调用 [POST] /mmpaysptrans/pay_bank 接口。 /// /// REF:
- /// + /// /// /// /// @@ -34,7 +34,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 /// 异步调用 [POST] /mmpaysptrans/query_bank 接口。 /// /// REF:
- /// + /// /// /// /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecuteRiskExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecuteRiskExtensions.cs index fdce15b9..a26d45cb 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecuteRiskExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecuteRiskExtensions.cs @@ -12,7 +12,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 /// 异步调用 [POST] /risk/getviolation 接口。 /// /// REF:
- /// + /// /// /// /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecuteSubMerchantExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecuteSubMerchantExtensions.cs index ee2cb0a3..4977b0b3 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecuteSubMerchantExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecuteSubMerchantExtensions.cs @@ -12,10 +12,10 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 /// 异步调用 [POST] /secapi/mch/addsubdevconfig 接口。 /// /// REF:
- ///
- ///
- ///
- /// + ///
+ ///
+ ///
+ /// /// /// /// @@ -37,8 +37,8 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 /// 异步调用 [POST] /secapi/mch/querysubdevconfig 接口。 /// /// REF:
- ///
- /// + ///
+ /// /// /// /// @@ -60,7 +60,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 /// 异步调用 [POST] /secapi/mkt/addrecommendconf 接口。 /// /// REF:
- /// + /// /// /// /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecuteToolsExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecuteToolsExtensions.cs index fa8cb076..f521f97b 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecuteToolsExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecuteToolsExtensions.cs @@ -12,8 +12,8 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 /// 异步调用 [POST] /tools/authcodetoopenid 接口。 /// /// REF:
- ///
- /// + ///
+ /// /// /// /// @@ -35,8 +35,9 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 /// 异步调用 [POST] /tools/shorturl 接口。 /// /// REF:
- ///
- /// + ///
+ ///
+ /// /// /// /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecuteTransitExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecuteTransitExtensions.cs new file mode 100644 index 00000000..87c975e8 --- /dev/null +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecuteTransitExtensions.cs @@ -0,0 +1,33 @@ +using System; +using System.Net.Http; +using System.Threading; +using System.Threading.Tasks; +using Flurl.Http; + +namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 +{ + public static class WechatTenpayClientExecuteTransitExtensions + { + /// + /// 异步调用 [POST] /transit/queryorder 接口。 + /// + /// REF:
+ /// + /// + /// + /// + /// + /// + /// + public static async Task ExecuteGetTransitOrderAsync(this WechatTenpayClient client, Models.GetTransitOrderRequest request, CancellationToken cancellationToken = default) + { + if (client is null) throw new ArgumentNullException(nameof(client)); + if (request is null) throw new ArgumentNullException(nameof(request)); + + IFlurlRequest flurlReq = client + .CreateFlurlRequest(request, HttpMethod.Post, "transit", "queryorder"); + + return await client.SendFlurlRequestAsXmlAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); + } + } +} diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecuteTransitPartnerExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecuteTransitPartnerExtensions.cs new file mode 100644 index 00000000..befd6f10 --- /dev/null +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecuteTransitPartnerExtensions.cs @@ -0,0 +1,33 @@ +using System; +using System.Net.Http; +using System.Threading; +using System.Threading.Tasks; +using Flurl.Http; + +namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 +{ + public static class WechatTenpayClientExecuteTransitPartnerExtensions + { + /// + /// 异步调用 [POST] /transit/partnerpay/queryorder 接口。 + /// + /// REF:
+ /// + /// + /// + /// + /// + /// + /// + public static async Task ExecuteGetTransitPartnerOrderAsync(this WechatTenpayClient client, Models.GetTransitPartnerOrderRequest request, CancellationToken cancellationToken = default) + { + if (client is null) throw new ArgumentNullException(nameof(client)); + if (request is null) throw new ArgumentNullException(nameof(request)); + + IFlurlRequest flurlReq = client + .CreateFlurlRequest(request, HttpMethod.Post, "transit", "partnerpay", "queryorder"); + + return await client.SendFlurlRequestAsXmlAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); + } + } +} diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecuteVehicleExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecuteVehicleExtensions.cs index 2d9e136b..d3b372df 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecuteVehicleExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecuteVehicleExtensions.cs @@ -12,7 +12,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 /// 异步调用 [POST] /vehicle/pay/notification 接口。 /// /// REF:
- /// + /// /// /// /// @@ -34,7 +34,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 /// 异步调用 [POST] /vehicle/pay/payapply 接口。 /// /// REF:
- /// + /// /// /// /// @@ -56,7 +56,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 /// 异步调用 [POST] /vehicle/pay/querystate 接口。 /// /// REF:
- /// + /// /// /// /// @@ -73,27 +73,5 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 return await client.SendFlurlRequestAsXmlAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } - - /// - /// 异步调用 [POST] /transit/queryorder 接口。 - /// - /// REF:
- /// - /// - /// - /// - /// - /// - /// - public static async Task ExecuteGetTransitOrderAsync(this WechatTenpayClient client, Models.GetTransitOrderRequest request, CancellationToken cancellationToken = default) - { - if (client is null) throw new ArgumentNullException(nameof(client)); - if (request is null) throw new ArgumentNullException(nameof(request)); - - IFlurlRequest flurlReq = client - .CreateFlurlRequest(request, HttpMethod.Post, "transit", "queryorder"); - - return await client.SendFlurlRequestAsXmlAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); - } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecuteVehiclePartnerExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecuteVehiclePartnerExtensions.cs index 66ab08bd..85b597c5 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecuteVehiclePartnerExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecuteVehiclePartnerExtensions.cs @@ -12,7 +12,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 /// 异步调用 [POST] /vehicle/partnerpay/notification 接口。 /// /// REF:
- /// + /// /// /// /// @@ -34,7 +34,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 /// 异步调用 [POST] /vehicle/partnerpay/payapply 接口。 /// /// REF:
- /// + /// /// /// /// @@ -56,7 +56,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 /// 异步调用 [POST] /vehicle/partnerpay/querystate 接口。 /// /// REF:
- /// + /// /// /// /// @@ -73,27 +73,5 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 return await client.SendFlurlRequestAsXmlAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } - - /// - /// 异步调用 [POST] /transit/partnerpay/queryorder 接口。 - /// - /// REF:
- /// - /// - /// - /// - /// - /// - /// - public static async Task ExecuteGetTransitPartnerOrderAsync(this WechatTenpayClient client, Models.GetTransitPartnerOrderRequest request, CancellationToken cancellationToken = default) - { - if (client is null) throw new ArgumentNullException(nameof(client)); - if (request is null) throw new ArgumentNullException(nameof(request)); - - IFlurlRequest flurlReq = client - .CreateFlurlRequest(request, HttpMethod.Post, "transit", "partnerpay", "queryorder"); - - return await client.SendFlurlRequestAsXmlAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); - } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecuteXDCExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecuteXDCExtensions.cs index 37813018..47cf51d6 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecuteXDCExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecuteXDCExtensions.cs @@ -12,18 +12,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 /// 异步调用 [POST] /xdc/apiv2getsignkey/sign/getsignkey 接口。 /// /// REF:
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- /// + /// /// /// /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientParameterExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientParameterExtensions.cs index 482a98dd..325bfac9 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientParameterExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientParameterExtensions.cs @@ -17,8 +17,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 /// 生成客户端小程序调起领取红包所需的参数字典。 /// /// REF:
- ///
- /// + /// /// /// /// @@ -50,9 +49,9 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 /// 生成客户端 JSAPI 调起支付所需的参数字典。 /// /// REF:
- ///
- ///
- /// + ///
+ ///
+ /// /// /// /// @@ -88,8 +87,9 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 /// 生成客户端 App 调起支付所需的参数字典。 /// /// REF:
- ///
- /// + ///
+ ///
+ /// /// /// /// @@ -128,9 +128,9 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 /// 生成客户端 App 调起支付所需的参数字典。 /// /// REF:
- ///
- ///
- /// + ///
+ ///
+ /// /// /// /// @@ -147,8 +147,9 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 /// 生成客户端小程序调起支付所需的参数字典。 /// /// REF:
- ///
- /// + ///
+ ///
+ /// /// /// /// @@ -369,7 +370,8 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 /// 生成客户端小程序唤起开通车主服务页面所需的参数字典。 /// /// REF:
- /// + ///
+ /// /// /// /// @@ -412,7 +414,8 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 /// 生成客户端 App 唤起开通车主服务页面所需的参数字典。 /// /// REF:
- /// + ///
+ /// /// /// /// @@ -447,7 +450,8 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 /// 生成客户端小程序唤起免密支付升级无感支付页面所需的参数字典。 /// /// REF:
- /// + ///
+ /// /// /// /// @@ -484,7 +488,8 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 /// 生成客户端 App 唤起免密支付升级无感支付页面所需的参数字典。 /// /// REF:
- /// + ///
+ /// /// /// /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PayMarketingTransfersRedPack/SendPayMarketingTransfersGroupRedPackRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PayMarketingTransfersRedPack/SendPayMarketingTransfersGroupRedPackRequest.cs deleted file mode 100644 index aeb2ad31..00000000 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PayMarketingTransfersRedPack/SendPayMarketingTransfersGroupRedPackRequest.cs +++ /dev/null @@ -1,125 +0,0 @@ -using System; - -namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models -{ - /// - /// 表示 [POST] /mmpaymkttransfers/sendgroupredpack 接口的请求。 - /// - [Obsolete("相关接口或字段于 2024-06-05 下线。")] - public class SendPayMarketingTransfersGroupRedPackRequest : WechatTenpaySignableRequest - { - /// - /// - /// - [Newtonsoft.Json.JsonProperty("mch_id")] - [System.Text.Json.Serialization.JsonPropertyName("mch_id")] - public override string? MerchantId { get; set; } - - /// - /// - /// - [Newtonsoft.Json.JsonProperty("wxappid")] - [System.Text.Json.Serialization.JsonPropertyName("wxappid")] - public override string? AppId { get; set; } - - /// - /// 获取或设置子商户号。 - /// - [Newtonsoft.Json.JsonProperty("sub_mch_id")] - [System.Text.Json.Serialization.JsonPropertyName("sub_mch_id")] - public string? SubMerchantId { get; set; } - - /// - /// 获取或设置子商户 AppId。 - /// - [Newtonsoft.Json.JsonProperty("msgappid")] - [System.Text.Json.Serialization.JsonPropertyName("msgappid")] - public string? SubAppId { get; set; } - - /// - /// 获取或设置商户订单号。 - /// - [Newtonsoft.Json.JsonProperty("mch_billno")] - [System.Text.Json.Serialization.JsonPropertyName("mch_billno")] - public string MerchantBillNumber { get; set; } = string.Empty; - - /// - /// 获取或设置接受红包的种子用户 OpenId。 - /// - [Newtonsoft.Json.JsonProperty("re_openid")] - [System.Text.Json.Serialization.JsonPropertyName("re_openid")] - public string OpenId { get; set; } = string.Empty; - - /// - /// 获取或设置红包发送者名称。 - /// - [Newtonsoft.Json.JsonProperty("send_name")] - [System.Text.Json.Serialization.JsonPropertyName("send_name")] - public string? SenderName { get; set; } - - /// - /// 获取或设置红包金额（单位：分）。 - /// - [Newtonsoft.Json.JsonProperty("total_amount")] - [System.Text.Json.Serialization.JsonPropertyName("total_amount")] - public int TotalAmount { get; set; } - - /// - /// 获取或设置红包数量。 - /// 默认值：1 - /// - [Newtonsoft.Json.JsonProperty("total_num")] - [System.Text.Json.Serialization.JsonPropertyName("total_num")] - public int TotalCount { get; set; } = 1; - - /// - /// 获取或设置红包金额设置方式。 - /// 默认值：ALL_RAND - /// - [Newtonsoft.Json.JsonProperty("amt_type")] - [System.Text.Json.Serialization.JsonPropertyName("amt_type")] - public string AmountType { get; set; } = "ALL_RAND"; - - /// - /// 获取或设置红包祝福语。 - /// - [Newtonsoft.Json.JsonProperty("wishing")] - [System.Text.Json.Serialization.JsonPropertyName("wishing")] - public string? Wishing { get; set; } - - /// - /// 获取或设置用户终端 IP。 - /// - [Newtonsoft.Json.JsonProperty("client_ip")] - [System.Text.Json.Serialization.JsonPropertyName("client_ip")] - public string ClientIp { get; set; } = string.Empty; - - /// - /// 获取或设置活动名称。 - /// - [Newtonsoft.Json.JsonProperty("act_name")] - [System.Text.Json.Serialization.JsonPropertyName("act_name")] - public string? ActivityName { get; set; } - - /// - /// 获取或设置备注。 - /// - [Newtonsoft.Json.JsonProperty("remark")] - [System.Text.Json.Serialization.JsonPropertyName("remark")] - public string? Remark { get; set; } - - /// - /// 获取或设置场景 ID。 - /// - [Newtonsoft.Json.JsonProperty("scene_id")] - [System.Text.Json.Serialization.JsonPropertyName("scene_id")] - public string? SceneId { get; set; } - - /// - /// 获取或设置活动风控信息。 - /// - [Newtonsoft.Json.JsonProperty("risk_info")] - [System.Text.Json.Serialization.JsonPropertyName("risk_info")] - public string? RiskInfo { get; set; } - } -} diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PayMarketingTransfersRedPack/SendPayMarketingTransfersGroupRedPackResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PayMarketingTransfersRedPack/SendPayMarketingTransfersGroupRedPackResponse.cs deleted file mode 100644 index c5227036..00000000 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PayMarketingTransfersRedPack/SendPayMarketingTransfersGroupRedPackResponse.cs +++ /dev/null @@ -1,69 +0,0 @@ -using System; - -namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models -{ - /// - /// 表示 [POST] /mmpaymkttransfers/sendgroupredpack 接口的响应。 - /// - [Obsolete("相关接口或字段于 2024-06-05 下线。")] - public class SendPayMarketingTransfersGroupRedPackResponse : WechatTenpaySignableResponse - { - /// - /// - /// - [Newtonsoft.Json.JsonProperty("mch_id")] - [System.Text.Json.Serialization.JsonPropertyName("mch_id")] -#pragma warning disable CS8618 -#pragma warning disable CS8765 - public override string MerchantId { get; set; } -#pragma warning restore CS8765 -#pragma warning restore CS8618 - - /// - /// - /// - [Newtonsoft.Json.JsonProperty("wxappid")] - [System.Text.Json.Serialization.JsonPropertyName("wxappid")] -#pragma warning disable CS8618 -#pragma warning disable CS8765 - public override string AppId { get; set; } -#pragma warning restore CS8765 -#pragma warning restore CS8618 - - /// - /// 获取或设置商户订单号。 - /// - [Newtonsoft.Json.JsonProperty("mch_billno")] - [System.Text.Json.Serialization.JsonPropertyName("mch_billno")] - public string MerchantBillNumber { get; set; } = default!; - - /// - /// 获取或设置商户付款单号。 - /// - [Newtonsoft.Json.JsonProperty("partner_trade_no")] - [System.Text.Json.Serialization.JsonPropertyName("partner_trade_no")] - public string PartnerTradeNumber { get; set; } = default!; - - /// - /// 获取或设置接受红包的种子用户 OpenId。 - /// - [Newtonsoft.Json.JsonProperty("re_openid")] - [System.Text.Json.Serialization.JsonPropertyName("re_openid")] - public string OpenId { get; set; } = default!; - - /// - /// 获取或设置红包金额（单位：分）。 - /// - [Newtonsoft.Json.JsonProperty("total_amount")] - [System.Text.Json.Serialization.JsonPropertyName("total_amount")] - [System.Text.Json.Serialization.JsonNumberHandling(System.Text.Json.Serialization.JsonNumberHandling.AllowReadingFromString)] - public int TotalAmount { get; set; } - - /// - /// 获取或设置微信红包订单号。 - /// - [Newtonsoft.Json.JsonProperty("send_listid")] - [System.Text.Json.Serialization.JsonPropertyName("send_listid")] - public string PaymentNumber { get; set; } = default!; - } -} diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Extensions/WechatTenpayGlobalClientExecuteCustomsExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Extensions/WechatTenpayGlobalClientExecuteCustomsExtensions.cs index 6bf5a7d4..8363304e 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Extensions/WechatTenpayGlobalClientExecuteCustomsExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Extensions/WechatTenpayGlobalClientExecuteCustomsExtensions.cs @@ -12,7 +12,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.ExtendedSDK.Global /// 异步调用 [POST] /customs/orders 接口。 /// /// REF:
- /// + /// /// /// /// @@ -37,7 +37,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.ExtendedSDK.Global /// 异步调用 [GET] /customs/orders 接口。 /// /// REF:
- /// + /// /// /// /// @@ -69,7 +69,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.ExtendedSDK.Global /// 异步调用 [POST] /customs/redeclare 接口。 /// /// REF:
- /// + /// /// /// /// @@ -94,7 +94,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.ExtendedSDK.Global /// 异步调用 [PATCH] /customs/orders 接口。 /// /// REF:
- /// + /// /// /// /// @@ -119,7 +119,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.ExtendedSDK.Global /// 异步调用 [POST] /customs/verify-certificate 接口。 /// /// REF:
- /// + /// /// /// /// diff --git a/test/SKIT.FlurlHttpClient.Wechat.TenpayV2.UnitTests/ModelSamples/PayMarketingTransfersRedPack/SendPayMarketingTransfersGroupRedPackRequest.json b/test/SKIT.FlurlHttpClient.Wechat.TenpayV2.UnitTests/ModelSamples/PayMarketingTransfersRedPack/SendPayMarketingTransfersGroupRedPackRequest.json deleted file mode 100644 index 06456563..00000000 --- a/test/SKIT.FlurlHttpClient.Wechat.TenpayV2.UnitTests/ModelSamples/PayMarketingTransfersRedPack/SendPayMarketingTransfersGroupRedPackRequest.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "sign": "E1EE61A91C8E90F299DE6AE075D60A2D", - "mch_billno": "0010010404201411170000046545", - "mch_id": "1000888888", - "sub_mch_id": "1000888888", - "wxappid": "wxcbda96de0b165486", - "send_name": "send_name", - "re_openid": "onqOjjmM1tad-3ROpncN-yUfa6uI", - "total_amount": "600", - "amt_type": "ALL_RAND", - "total_num": "3", - "wishing": "恭喜发财", - "act_name": "新年红包", - "remark": "新年红包", - "scene_id": "PRODUCT_2", - "nonce_str": "50780e0cca98c8c8e814883e5caa672e", - "risk_info": "posttime%3d123123412%26clientversion%3d234134%26mobile%3d122344545%26deviceid%3dIOS" -} diff --git a/test/SKIT.FlurlHttpClient.Wechat.TenpayV2.UnitTests/ModelSamples/PayMarketingTransfersRedPack/SendPayMarketingTransfersGroupRedPackResponse.json b/test/SKIT.FlurlHttpClient.Wechat.TenpayV2.UnitTests/ModelSamples/PayMarketingTransfersRedPack/SendPayMarketingTransfersGroupRedPackResponse.json deleted file mode 100644 index 49b8ba2c..00000000 --- a/test/SKIT.FlurlHttpClient.Wechat.TenpayV2.UnitTests/ModelSamples/PayMarketingTransfersRedPack/SendPayMarketingTransfersGroupRedPackResponse.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "return_code": "SUCCESS", - "return_msg": "发放成功.", - "result_code": "SUCCESS", - "err_code": "0", - "err_code_des": "发放成功.", - "mch_billno": "0010010404201411170000046545", - "mch_id": "10010404", - "wxappid": "wx6fa7e3bab7e15415", - "re_openid": "onqOjjmM1tad-3ROpncN-yUfa6uI", - "total_amount": "3" -} diff --git a/test/SKIT.FlurlHttpClient.Wechat.TenpayV2.UnitTests/TestCase_ApiExecutePayMarketingTransfersRedPackTests.cs b/test/SKIT.FlurlHttpClient.Wechat.TenpayV2.UnitTests/TestCase_ApiExecutePayMarketingTransfersRedPackTests.cs deleted file mode 100644 index 2865ba96..00000000 --- a/test/SKIT.FlurlHttpClient.Wechat.TenpayV2.UnitTests/TestCase_ApiExecutePayMarketingTransfersRedPackTests.cs +++ /dev/null @@ -1,29 +0,0 @@ -using System; -using System.Threading.Tasks; -using Xunit; - -namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.UnitTests -{ - public class TestCase_ApiExecutePayMarketingTransfersRedPackTests - { - [Fact(DisplayName = "测试用例：调用 API [POST] /mmpaymkttransfers/sendgroupredpack")] - public async Task TestCase_ApiExecuteSendPayMarketingTransfersGroupRedPackTests() - { - var request = new Models.SendPayMarketingTransfersGroupRedPackRequest() - { - ActivityName = "TEST_ACT", - MerchantBillNumber = "TESTMBN" + DateTimeOffset.Now.ToString("yyyyMMddHHmmssfff"), - AppId = TestConfigs.WechatAppId, - OpenId = TestConfigs.WechatOpenId, - SenderName = "TEST_SENDER", - TotalAmount = 100, - TotalCount = 10, - Wishing = "TEST_WISH", - ClientIp = "127.0.0.7" - }; - var response = await TestClients.Instance.ExecuteSendPayMarketingTransfersGroupRedPackAsync(request); - - Assert.NotNull(response.PartnerTradeNumber); - } - } -}