Merge pull request JeffreySu#1456 from JeffreySu/Developer

Developer
lovepoco · Oct 23, 2018 · 0173f04 · 0173f04
2 parents e11935e + 2063638
commit 0173f04
Show file tree

Hide file tree

Showing 14 changed files with 26 additions and 25 deletions.
diff --git a/.../Senparc.Weixin.MP.Sample.CommonService/Senparc.Weixin.MP.CoreSample.CommonService.csproj b/.../Senparc.Weixin.MP.Sample.CommonService/Senparc.Weixin.MP.CoreSample.CommonService.csproj
@@ -12,7 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Senparc.NeuChar" Version="0.2.11" />
+    <PackageReference Include="Senparc.NeuChar" Version="0.3.1" />
     <PackageReference Include="System.Diagnostics.FileVersionInfo" Version="4.3.0" />
   </ItemGroup>
 

diff --git a/src/Senparc.Weixin.MP.MvcExtension/Senparc.Weixin.MP.MvcExtension/Properties/AssemblyInfo.cs b/src/Senparc.Weixin.MP.MvcExtension/Senparc.Weixin.MP.MvcExtension/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // 可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值，
 // 方法是按如下所示使用“*”:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("7.1.10.*")]
+[assembly: AssemblyVersion("7.1.11.*")]
 //[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/....MvcExtension/Senparc.Weixin.MP.MvcExtension/Senparc.Weixin.MP.MvcExtension.vs2017.csproj b/....MvcExtension/Senparc.Weixin.MP.MvcExtension/Senparc.Weixin.MP.MvcExtension.vs2017.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>net40;net45;netstandard2.0;netcoreapp2.0;netcoreapp2.1</TargetFrameworks>
-    <Version>7.1.10</Version>
+    <Version>7.1.11</Version>
     <AssemblyName>Senparc.Weixin.MP.MvcExtension</AssemblyName>
     <RootNamespace>Senparc.Weixin.MP.MvcExtension</RootNamespace>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
@@ -226,7 +226,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Senparc.NeuChar" Version="0.2.11" />
+    <PackageReference Include="Senparc.NeuChar" Version="0.3.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Senparc.Weixin.MP/Senparc.Weixin.MP/AdvancedAPIs/Invoice/InvoiceApi.cs b/src/Senparc.Weixin.MP/Senparc.Weixin.MP/AdvancedAPIs/Invoice/InvoiceApi.cs
@@ -382,7 +382,7 @@ public static WxJsonResult UpdateStatus(string accessTokenOrAppId, string cardId
                 {
                     card_id = cardId,
                     code = code,
-                    reimburse_status = reimburseStatus
+                    reimburse_status = reimburseStatus.ToString()
                 };
 
                 return CommonJsonSend.Send<WxJsonResult>(null, urlFormat, data, timeOut: timeOut);
@@ -504,7 +504,7 @@ public static WxJsonResult UpdateInvoiceStatus(string accessTokenOrAppId, string
                 {
                     card_id = cardId,
                     encrypt_code = encryptCode,
-                    reimburse_status = reimburseStatus
+                    reimburse_status = reimburseStatus.ToString()
                 };
 
                 return CommonJsonSend.Send<WxJsonResult>(null, urlFormat, data, timeOut: timeOut);
@@ -530,7 +530,7 @@ public static WxJsonResult UpdateInvoiceListStatus(string accessTokenOrAppId, st
                 var data = new
                 {
                     openid = openId,
-                    reimburse_status = reimburseStatus,
+                    reimburse_status = reimburseStatus.ToString(),
                     invoice_list = itemList
                 };
 
@@ -1047,7 +1047,7 @@ public static async Task<WxJsonResult> UpdateStatusAsync(string accessTokenOrApp
                 {
                     card_id = cardId,
                     code = code,
-                    reimburse_status = reimburseStatus
+                    reimburse_status = reimburseStatus.ToString()
                 };
 
                 return await CommonJsonSend.SendAsync<WxJsonResult>(null, urlFormat, data, timeOut: timeOut);
@@ -1168,7 +1168,7 @@ public static async Task<WxJsonResult> UpdateInvoiceStatusAsync(string accessTok
                 {
                     card_id = cardId,
                     encrypt_code = encryptCode,
-                    reimburse_status = reimburseStatus
+                    reimburse_status = reimburseStatus.ToString()
                 };
 
                 return await CommonJsonSend.SendAsync<WxJsonResult>(null, urlFormat, data, timeOut: timeOut);
@@ -1194,7 +1194,7 @@ public static async Task<WxJsonResult> UpdateInvoiceListStatusAsync(string acces
                 var data = new
                 {
                     openid = openId,
-                    reimburse_status = reimburseStatus,
+                    reimburse_status = reimburseStatus.ToString(),
                     invoice_list = itemList
                 };
 

diff --git a/src/Senparc.Weixin.MP/Senparc.Weixin.MP/Properties/AssemblyInfo.cs b/src/Senparc.Weixin.MP/Senparc.Weixin.MP/Properties/AssemblyInfo.cs
@@ -53,6 +53,6 @@ and limitations under the License.
 // 可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值，
 // 方法是按如下所示使用“*”:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("16.4.7.*")]
+[assembly: AssemblyVersion("16.4.9.*")]
 //[assembly: AssemblyInformationalVersion("13.3.1-alpha")]
 //[assembly: AssemblyFileVersion("0.4.2.0")]
diff --git a/src/Senparc.Weixin.MP/Senparc.Weixin.MP/Senparc.Weixin.MP.vs2017.csproj b/src/Senparc.Weixin.MP/Senparc.Weixin.MP/Senparc.Weixin.MP.vs2017.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>net35;net40;net45;netstandard2.0;netcoreapp2.0;netcoreapp2.1</TargetFrameworks>
-    <Version>16.4.7</Version>
+    <Version>16.4.9</Version>
     <AssemblyName>Senparc.Weixin.MP</AssemblyName>
     <RootNamespace>Senparc.Weixin.MP</RootNamespace>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
@@ -443,6 +443,7 @@
       v16.4.5 支持 Senparc.NeuChar v0.2.9.1
       v16.4.5 支持 Senparc.NeuChar v0.2.10，支持 NeuChar 连接检测
       v16.4.7 Senparc.NeuChar v0.2.11，升级 MessageHandler
+      v16.4.9 修正发票接口问题
     </PackageReleaseNotes>
     <RepositoryUrl>https://github.com/JeffreySu/WeiXinMPSDK</RepositoryUrl>
   </PropertyGroup>
@@ -589,7 +590,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Senparc.NeuChar" Version="0.2.11" />
+    <PackageReference Include="Senparc.NeuChar" Version="0.3.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Senparc.Weixin.Open/Senparc.Weixin.Open/Properties/AssemblyInfo.cs b/src/Senparc.Weixin.Open/Senparc.Weixin.Open/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // 可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值，
 // 方法是按如下所示使用“*”:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("4.1.13.*")]
+[assembly: AssemblyVersion("4.1.14.*")]
 //[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/src/Senparc.Weixin.Open/Senparc.Weixin.Open/Senparc.Weixin.Open.vs2017.csproj b/src/Senparc.Weixin.Open/Senparc.Weixin.Open/Senparc.Weixin.Open.vs2017.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>net35;net40;net45;netstandard2.0;netcoreapp2.0;netcoreapp2.1</TargetFrameworks>
-    <Version>4.1.13</Version>
+    <Version>4.1.14</Version>
     <AssemblyName>Senparc.Weixin.Open</AssemblyName>
     <RootNamespace>Senparc.Weixin.Open</RootNamespace>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
@@ -262,7 +262,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Senparc.NeuChar" Version="0.2.11" />
+    <PackageReference Include="Senparc.NeuChar" Version="0.3.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Senparc.Weixin.Work/Senparc.Weixin.Work/Properties/AssemblyInfo.cs b/src/Senparc.Weixin.Work/Senparc.Weixin.Work/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // 可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值，
 // 方法是按如下所示使用“*”:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.1.14.*")]
+[assembly: AssemblyVersion("3.1.15.*")]
 //[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/src/Senparc.Weixin.Work/Senparc.Weixin.Work/Senparc.Weixin.Work.vs2017.csproj b/src/Senparc.Weixin.Work/Senparc.Weixin.Work/Senparc.Weixin.Work.vs2017.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFrameworks>net35;net40;net45;netstandard2.0;netcoreapp2.0;netcoreapp2.1</TargetFrameworks>
-		<Version>3.1.14</Version>
+		<Version>3.1.15</Version>
 		<AssemblyName>Senparc.Weixin.Work</AssemblyName>
 		<RootNamespace>Senparc.Weixin.Work</RootNamespace>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
@@ -272,7 +272,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-	  <PackageReference Include="Senparc.NeuChar" Version="0.2.11" />
+	  <PackageReference Include="Senparc.NeuChar" Version="0.3.1" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/....Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/Properties/AssemblyInfo.cs b/....Weixin.WxOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值，
 // 方法是按如下所示使用“*”: :
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.1.14.*")]
+[assembly: AssemblyVersion("3.1.15.*")]
 //[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/...xOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen.vs2017.csproj b/...xOpen/src/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen/Senparc.Weixin.WxOpen.vs2017.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>net40;net45;netstandard2.0;netcoreapp2.0;netcoreapp2.1</TargetFrameworks>
-    <Version>3.1.14</Version>
+    <Version>3.1.15</Version>
     <AssemblyName>Senparc.Weixin.WxOpen</AssemblyName>
     <RootNamespace>Senparc.Weixin.WxOpen</RootNamespace>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
@@ -267,7 +267,7 @@
 
 
   <ItemGroup>
-    <PackageReference Include="Senparc.NeuChar" Version="0.2.11" />
+    <PackageReference Include="Senparc.NeuChar" Version="0.3.1" />
   </ItemGroup>
 
 

diff --git a/src/Senparc.Weixin/Senparc.Weixin/Properties/AssemblyInfo.cs b/src/Senparc.Weixin/Senparc.Weixin/Properties/AssemblyInfo.cs
@@ -34,5 +34,5 @@
 // 可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值，
 // 方法是按如下所示使用“*”:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("6.1.8.*")]
+[assembly: AssemblyVersion("6.1.9.*")]
 //[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/src/Senparc.Weixin/Senparc.Weixin/Senparc.Weixin.vs2017.csproj b/src/Senparc.Weixin/Senparc.Weixin/Senparc.Weixin.vs2017.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>net35;net40;net45;netstandard2.0;netcoreapp2.0;netcoreapp2.1</TargetFrameworks>
-    <Version>6.1.8</Version>
+    <Version>6.1.9</Version>
     <AssemblyName>Senparc.Weixin</AssemblyName>
     <RootNamespace>Senparc.Weixin</RootNamespace>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
@@ -369,7 +369,7 @@
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
     <PackageReference Include="Senparc.CO2NET" Version="0.2.16" />
-    <PackageReference Include="Senparc.NeuChar" Version="0.2.11" />
+    <PackageReference Include="Senparc.NeuChar" Version="0.3.1" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net35' ">