From f164620ada64cd8d54862e72684522e397f39f99 Mon Sep 17 00:00:00 2001
From: JeffreySu <www.jeffrey.su@gmail.com>
Date: Tue, 20 Feb 2024 00:30:11 +0800
Subject: [PATCH] =?UTF-8?q?TenPayV3=20v1.2.1.1=20=E8=A7=A3=E5=86=B3?=
 =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=94=AF=E4=BB=98=E5=88=86=E3=80=81=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90=E8=AE=A2=E5=8D=95=E5=8F=82=E6=95=B0=E5=8F=AF=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA=E7=9A=84=E9=97=AE=E9=A2=98=20Issue=20#2989=20?=
 =?UTF-8?q?=E6=84=9F=E8=B0=A2=20@zariczhu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Entities/RequestData/CancelServiceOrderRequestData.cs    | 1 +
 .../Entities/RequestData/CompleteServiceOrderRequestData.cs  | 2 ++
 .../Senparc.Weixin.TenPayV3.net8.csproj                      | 5 +++--
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/Senparc.Weixin.TenPay/Senparc.Weixin.TenPayV3/Apis/PayScore/Entities/RequestData/CancelServiceOrderRequestData.cs b/src/Senparc.Weixin.TenPay/Senparc.Weixin.TenPayV3/Apis/PayScore/Entities/RequestData/CancelServiceOrderRequestData.cs
index 4667f1e4e2..e0794c1af9 100644
--- a/src/Senparc.Weixin.TenPay/Senparc.Weixin.TenPayV3/Apis/PayScore/Entities/RequestData/CancelServiceOrderRequestData.cs
+++ b/src/Senparc.Weixin.TenPay/Senparc.Weixin.TenPayV3/Apis/PayScore/Entities/RequestData/CancelServiceOrderRequestData.cs
@@ -67,6 +67,7 @@ public CancelServiceOrderRequestData()
         /// <para>path商户系统内部服务订单号（不是交易单号），与创建订单时一致。 </para>
         /// <para>示例值：2304203423948239423 </para>
         /// </summary>
+        [JsonIgnore]
         public string out_order_no { get; set; }
 
         /// <summary>
diff --git a/src/Senparc.Weixin.TenPay/Senparc.Weixin.TenPayV3/Apis/PayScore/Entities/RequestData/CompleteServiceOrderRequestData.cs b/src/Senparc.Weixin.TenPay/Senparc.Weixin.TenPayV3/Apis/PayScore/Entities/RequestData/CompleteServiceOrderRequestData.cs
index e3ef8fb8fe..8bee267e77 100644
--- a/src/Senparc.Weixin.TenPay/Senparc.Weixin.TenPayV3/Apis/PayScore/Entities/RequestData/CompleteServiceOrderRequestData.cs
+++ b/src/Senparc.Weixin.TenPay/Senparc.Weixin.TenPayV3/Apis/PayScore/Entities/RequestData/CompleteServiceOrderRequestData.cs
@@ -30,6 +30,7 @@
 ----------------------------------------------------------------*/
 
 
+using Newtonsoft.Json;
 using Senparc.Weixin.TenPayV3.Entities;
 using System;
 using System.Collections.Generic;
@@ -86,6 +87,7 @@ public CompleteServiceOrderRequestData()
         /// <para>path 商户系统内部服务订单号（不是交易单号），与创建订单时一致</para>
         /// <para>示例值：1234323JKHDFE1243252 </para>
         /// </summary>
+        [JsonIgnore]
         public string out_order_no { get; set; }
 
         /// <summary>
diff --git a/src/Senparc.Weixin.TenPay/Senparc.Weixin.TenPayV3/Senparc.Weixin.TenPayV3.net8.csproj b/src/Senparc.Weixin.TenPay/Senparc.Weixin.TenPayV3/Senparc.Weixin.TenPayV3.net8.csproj
index 2f53efcb6e..2f6f454383 100644
--- a/src/Senparc.Weixin.TenPay/Senparc.Weixin.TenPayV3/Senparc.Weixin.TenPayV3.net8.csproj
+++ b/src/Senparc.Weixin.TenPay/Senparc.Weixin.TenPayV3/Senparc.Weixin.TenPayV3.net8.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.1</TargetFramework>
-    <Version>1.2.1</Version>
+    <Version>1.2.1.1</Version>
     <AssemblyName>Senparc.Weixin.TenPayV3</AssemblyName>
     <RootNamespace>Senparc.Weixin.TenPayV3</RootNamespace>
     <LangVersion>10.0</LangVersion>
@@ -53,7 +53,8 @@
 		2、添加小程序发货信息管理服务消息事件 PR#2908
 		3、TenPayV3分账 字段内部加密 PR#2909
 		v1.1.0 TenPaySignHelper.GetJsApiUiPackage() 方法添加 senparcWeixinSettingForTenpayV3 参数
-</PackageReleaseNotes>
+		v1.2.1.1 解决微信支付分、完成订单参数可为空的问题 Issue #2989
+	</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/JeffreySu/WeiXinMPSDK</RepositoryUrl>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">