Merge pull request #2612 from JeffreySu/Developer

TenPayV3 v0.6.1 修复 CloseOrderAsync() 参数问题 #2606 感谢@6101234
JeffreySu · Apr 3, 2022 · 5936d36 · 5936d36
2 parents 7d9b27f + f3b968f
commit 5936d36
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 13 deletions.
diff --git a/Samples/TenPayV2/Senparc.Weixin.Sample.TenPayV2/Properties/launchSettings.json b/Samples/TenPayV2/Senparc.Weixin.Sample.TenPayV2/Properties/launchSettings.json
@@ -8,7 +8,7 @@
     }
   },
   "profiles": {
-    "Senparc.Weixin.Sample.MP": {
+    "Senparc.Weixin.Sample.TenPayV2": {
       "commandName": "Project",
       "dotnetRunMessages": true,
       "launchBrowser": true,

diff --git a/src/Senparc.Weixin.TenPay/Senparc.Weixin.TenPayV3/Apis/BasePay/BasePayApis.cs b/src/Senparc.Weixin.TenPay/Senparc.Weixin.TenPayV3/Apis/BasePay/BasePayApis.cs
@@ -44,7 +44,10 @@
 
     修改标识：Senparc - 20211026
     修改描述：v0.3.500.5 修复 RefundQueryAsync() 方法接口参数传递问题
-    
+
+    修改标识：Senparc - 20211026
+    修改描述：v0.6.1 修复 CloseOrderAsync() 参数问题
+
 ----------------------------------------------------------------*/
 
 using Senparc.CO2NET.Helpers;
@@ -76,7 +79,7 @@ public class BasePayApis
         public BasePayApis(ISenparcWeixinSettingForTenpayV3 senparcWeixinSettingForTenpayV3 = null)
         {
             _tenpayV3Setting = senparcWeixinSettingForTenpayV3 ?? Senparc.Weixin.Config.SenparcWeixinSetting.TenpayV3Setting;
-           
+
         }
 
         //private readonly IServiceProvider _serviceProvider;
@@ -411,7 +414,11 @@ public async Task<ReturnJsonBase> CloseOrderAsync(string out_trade_no, string mc
             {
                 var url = ReurnPayApiUrl($"{Senparc.Weixin.Config.TenPayV3Host}/{{0}}v3/pay/transactions/out-trade-no/{out_trade_no}/close");
                 TenPayApiRequest tenPayApiRequest = new(_tenpayV3Setting);
-                return await tenPayApiRequest.RequestAsync<ReturnJsonBase>(url, mchid, timeOut);
+                var data = new
+                {
+                    mchid = mchid
+                };
+                return await tenPayApiRequest.RequestAsync<ReturnJsonBase>(url, data, timeOut);
             }
             catch (Exception ex)
             {

diff --git a/src/Senparc.Weixin.TenPay/Senparc.Weixin.TenPayV3/Senparc.Weixin.TenPayV3.net6.csproj b/src/Senparc.Weixin.TenPay/Senparc.Weixin.TenPayV3/Senparc.Weixin.TenPayV3.net6.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.1</TargetFramework>
-    <Version>0.6-beta1</Version>
+    <Version>0.6.1-beta1</Version>
     <AssemblyName>Senparc.Weixin.TenPayV3</AssemblyName>
     <RootNamespace>Senparc.Weixin.TenPayV3</RootNamespace>
     <LangVersion>10.0</LangVersion>
@@ -23,14 +23,15 @@
     <PackageProjectUrl>https://github.com/JeffreySu/WeiXinMPSDK</PackageProjectUrl>
     <PackageIcon>icon.jpg</PackageIcon>
     <PackageReleaseNotes>
-			v0.1.0 创世
-			v0.3.500.2 重构加密方法
-			v0.3.500.3 修正合单支付的 URL 路径错误
-			v0.3.500.4 完成商家券接口、委托营销接口、消费卡接口、支付有礼接口
-			v0.5.1 修复PayV3营销工具商户券API
-			v0.5.6 使用 Senparc.Weixin.Config.TenPayV3Host 提供可配置的 API 域名
-			v0.5.7 升级微信支付请求的方法，支持多种加密方式
-</PackageReleaseNotes>
+		v0.1.0 创世
+		v0.3.500.2 重构加密方法
+		v0.3.500.3 修正合单支付的 URL 路径错误
+		v0.3.500.4 完成商家券接口、委托营销接口、消费卡接口、支付有礼接口
+		v0.5.1 修复PayV3营销工具商户券API
+		v0.5.6 使用 Senparc.Weixin.Config.TenPayV3Host 提供可配置的 API 域名
+		v0.5.7 升级微信支付请求的方法，支持多种加密方式
+		v0.6.1 修复 CloseOrderAsync() 参数问题
+	</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/JeffreySu/WeiXinMPSDK</RepositoryUrl>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">