Merge pull request #2760 from JeffreySu/Developer

TenPayV3 v0.6.8.4 修改 week_day 类型为 int[]
JeffreySu · Jan 9, 2023 · 7f6ae8a · 7f6ae8a
2 parents a455ffd + b94d289
commit 7f6ae8a
Show file tree

Hide file tree

Showing 5 changed files with 95 additions and 81 deletions.
diff --git a/...rc.Weixin.TenPayV3/Apis/Marketing/Entities/RequestData/CreateBusifavorStockRequestData.cs b/...rc.Weixin.TenPayV3/Apis/Marketing/Entities/RequestData/CreateBusifavorStockRequestData.cs
@@ -27,6 +27,9 @@ and limitations under the License.
     
     创建标识：Senparc - 20210907
     
+    修改标识：Senparc - 20230109
+    修改描述：v0.6.8.4 修改 week_day 类型为 int[]
+
 ----------------------------------------------------------------*/
 
 using Senparc.Weixin.TenPayV3.Entities;
@@ -342,7 +345,7 @@ public class Available_Week
                     /// </summary>
                     /// <param name="week_day">可用星期数  <para>0代表周日，1代表周一，以此类推当填写available_day_time时，week_day必填</para><para>示例值：1,2</para></param>
                     /// <param name="available_day_time">当天可用时间段 <para>可以填写多个时间段，最多不超过2个。</para><para>可为null</para></param>
-                    public Available_Week(string[] week_day, Available_Day_Time[] available_day_time)
+                    public Available_Week(int[] week_day, Available_Day_Time[] available_day_time)
                     {
                         this.week_day = week_day;
                         this.available_day_time = available_day_time;
@@ -360,7 +363,7 @@ public Available_Week()
                     /// <para>0代表周日，1代表周一，以此类推 当填写available_day_time时，week_day必填</para>
                     /// <para>示例值：1, 2 </para>
                     /// </summary>
-                    public string[] week_day { get; set; }
+                    public int[] week_day { get; set; }
 
                     /// <summary>
                     /// 当天可用时间段

diff --git a/...parc.Weixin.TenPayV3/Apis/Marketing/Entities/ReturnJson/QueryBusifavorCouponReturnJson.cs b/...parc.Weixin.TenPayV3/Apis/Marketing/Entities/ReturnJson/QueryBusifavorCouponReturnJson.cs
@@ -27,6 +27,9 @@ and limitations under the License.
     
     创建标识：Senparc - 20210907
     
+    修改标识：Senparc - 20230109
+    修改描述：v0.6.8.4 修改 week_day 类型为 int[]
+
 ----------------------------------------------------------------*/
 using System;
 using System.Collections.Generic;
@@ -430,7 +433,7 @@ public class Available_Week
                     /// </summary>
                     /// <param name="week_day">可用星期数  <para>0代表周日，1代表周一，以此类推。</para><para>示例值：1,2</para><para>可为null</para></param>
                     /// <param name="available_day_time">当天可用时间段 <para>可以填写多个时间段，最多不超过2个。</para><para>可为null</para></param>
-                    public Available_Week(string[] week_day, Available_Day_Time[] available_day_time)
+                    public Available_Week(int[] week_day, Available_Day_Time[] available_day_time)
                     {
                         this.week_day = week_day;
                         this.available_day_time = available_day_time;
@@ -449,7 +452,7 @@ public Available_Week()
                     /// <para>示例值：1, 2 </para>
                     /// <para>可为null</para>
                     /// </summary>
-                    public string[] week_day { get; set; }
+                    public int[] week_day { get; set; }
 
                     /// <summary>
                     /// 当天可用时间段

diff --git a/...arc.Weixin.TenPayV3/Apis/Marketing/Entities/ReturnJson/QueryBusifavorCouponsReturnJson.cs b/...arc.Weixin.TenPayV3/Apis/Marketing/Entities/ReturnJson/QueryBusifavorCouponsReturnJson.cs
@@ -27,6 +27,9 @@ and limitations under the License.
     
     创建标识：Senparc - 20210907
     
+    修改标识：Senparc - 20230109
+    修改描述：v0.6.8.4 修改 week_day 类型为 int[]
+
 ----------------------------------------------------------------*/
 using System;
 using System.Collections.Generic;
@@ -512,7 +515,7 @@ public class Available_Week
                         /// </summary>
                         /// <param name="week_day">可用星期数  <para>0代表周日，1代表周一，以此类推。</para><para>示例值：1,2</para><para>可为null</para></param>
                         /// <param name="available_day_time">当天可用时间段 <para>可以填写多个时间段，最多不超过2个。</para><para>可为null</para></param>
-                        public Available_Week(string[] week_day, Available_Day_Time[] available_day_time)
+                        public Available_Week(int[] week_day, Available_Day_Time[] available_day_time)
                         {
                             this.week_day = week_day;
                             this.available_day_time = available_day_time;
@@ -531,7 +534,7 @@ public Available_Week()
                         /// <para>示例值：1, 2 </para>
                         /// <para>可为null</para>
                         /// </summary>
-                        public string[] week_day { get; set; }
+                        public int[] week_day { get; set; }
 
                         /// <summary>
                         /// 当天可用时间段

diff --git a/...nparc.Weixin.TenPayV3/Apis/Marketing/Entities/ReturnJson/QueryBusifavorStockReturnJson.cs b/...nparc.Weixin.TenPayV3/Apis/Marketing/Entities/ReturnJson/QueryBusifavorStockReturnJson.cs
@@ -26,7 +26,10 @@ and limitations under the License.
     
     
     创建标识：Senparc - 20210907
-    
+
+    修改标识：Senparc - 20230109
+    修改描述：v0.6.8.4 修改 week_day 类型为 int[]
+ 
 ----------------------------------------------------------------*/
 using System;
 using System.Collections.Generic;
@@ -359,7 +362,7 @@ public class Available_Week
                     /// </summary>
                     /// <param name="week_day">可用星期数  <para>0代表周日，1代表周一，以此类推。</para><para>示例值：1,2</para><para>可为null</para></param>
                     /// <param name="available_day_time">当天可用时间段 <para>可以填写多个时间段，最多不超过2个。</para><para>可为null</para></param>
-                    public Available_Week(string[] week_day, Available_Day_Time[] available_day_time)
+                    public Available_Week(int[] week_day, Available_Day_Time[] available_day_time)
                     {
                         this.week_day = week_day;
                         this.available_day_time = available_day_time;
@@ -378,7 +381,7 @@ public Available_Week()
                     /// <para>示例值：1, 2 </para>
                     /// <para>可为null</para>
                     /// </summary>
-                    public string[] week_day { get; set; }
+                    public int[] week_day { get; set; }
 
                     /// <summary>
                     /// 当天可用时间段

diff --git a/src/Senparc.Weixin.TenPay/Senparc.Weixin.TenPayV3/Senparc.Weixin.TenPayV3.net7.csproj b/src/Senparc.Weixin.TenPay/Senparc.Weixin.TenPayV3/Senparc.Weixin.TenPayV3.net7.csproj
@@ -1,79 +1,81 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
-    <Version>0.6.8.3</Version>
-    <AssemblyName>Senparc.Weixin.TenPayV3</AssemblyName>
-    <RootNamespace>Senparc.Weixin.TenPayV3</RootNamespace>
-    <LangVersion>10.0</LangVersion>
-    <GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>
-    <Description>
+	<PropertyGroup>
+		<TargetFramework>netstandard2.1</TargetFramework>
+		<Version>0.6.8.4</Version>
+		<AssemblyName>Senparc.Weixin.TenPayV3</AssemblyName>
+		<RootNamespace>Senparc.Weixin.TenPayV3</RootNamespace>
+		<LangVersion>10.0</LangVersion>
+		<GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>
+		<Description>
 			微信 SDK - 微信支付 V3 模块
 
 			Senparc.Weixin SDK 开源项目：
 			https://github.com/JeffreySu/WeiXinMPSDK
 		</Description>
-    <Copyright>Senparc Copyright © 2004~2022</Copyright>
-    <PackageTags>微信,微信支付,weixin,公众号,WeChat,Senparc,盛派,SDK,C#,JSSDK,分布式,小程序,JSSDK,微信支付,摇一摇周边</PackageTags>
-    <Authors>Jeffrey Su</Authors>
-    <Owners>Senparc</Owners>
-    <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
-    <ProjectUrl>https://github.com/JeffreySu/WeiXinMPSDK</ProjectUrl>
-    <Title>Senparc.Weixin.TenPayV3.dll</Title>
-    <Summary>微信支付 V3 SDK for C#</Summary>
-    <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 升级微信支付请求的方法，支持多种加密方式
-		v0.6.1 修复 CloseOrderAsync() 参数问题
-		v0.6.2.2 修复 TenPayHttpClient 赋值问题
-		v0.6.3 添加“发起商家转账API”
-		v0.6.5 重构 BasePayApis.GetPayApiUrl() 方法
-		v0.6.8.2 
-	</PackageReleaseNotes>
-    <RepositoryUrl>https://github.com/JeffreySu/WeiXinMPSDK</RepositoryUrl>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <OutputPath>..\..\BuildOutPut</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <OutputPath>..\..\BuildOutPut</OutputPath>
-    <DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
-    <DocumentationFile>..\..\BuildOutPut\Senparc.Weixin.TenPayV3.xml</DocumentationFile>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard2.1|AnyCPU'">
-    <OutputPath>..\..\BuildOutPut\</OutputPath>
-    <DocumentationFile>..\..\BuildOutPut\netstandard2.1\Senparc.Weixin.Open.xml</DocumentationFile>
-  </PropertyGroup>
-  <ItemGroup>
-    <None Include="..\..\Senparc.Weixin\icon.jpg" Pack="true" Visible="false" PackagePath="" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Remove="Apis\Marketing\Entities\MarketingApis.Busifavor.cs" />
-    <Compile Remove="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' ">
-    <PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Senparc.CO2NET.AspNet" Version="1.1.3.4" />
-    <PackageReference Include="System.Security.Cryptography.Cng" Version="5.0.0" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\Senparc.Weixin\Senparc.Weixin\Senparc.Weixin.net7.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" />
-  </ItemGroup>
+		<Copyright>Senparc Copyright © 2004~2022</Copyright>
+		<PackageTags>微信,微信支付,weixin,公众号,WeChat,Senparc,盛派,SDK,C#,JSSDK,分布式,小程序,JSSDK,微信支付,摇一摇周边</PackageTags>
+		<Authors>Jeffrey Su</Authors>
+		<Owners>Senparc</Owners>
+		<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
+		<ProjectUrl>https://github.com/JeffreySu/WeiXinMPSDK</ProjectUrl>
+		<Title>Senparc.Weixin.TenPayV3.dll</Title>
+		<Summary>微信支付 V3 SDK for C#</Summary>
+		<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 升级微信支付请求的方法，支持多种加密方式
+			v0.6.1 修复 CloseOrderAsync() 参数问题
+			v0.6.2.2 修复 TenPayHttpClient 赋值问题
+			v0.6.3 添加“发起商家转账API”
+			v0.6.5 重构 BasePayApis.GetPayApiUrl() 方法
+			v0.6.8.2 MarketingApis.ModifyBusifavorStockInformationAsync 方法单独提取参数 stock_id
+			v0.6.8.3 MarketingApis.ModifyBusifavorStockBudgetAsync 方法单独提取参数 stock_id
+			v0.6.8.4 修改 week_day 类型为 int[]
+		</PackageReleaseNotes>
+		<RepositoryUrl>https://github.com/JeffreySu/WeiXinMPSDK</RepositoryUrl>
+	</PropertyGroup>
+	<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+		<OutputPath>..\..\BuildOutPut</OutputPath>
+		<DefineConstants>TRACE</DefineConstants>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+		<OutputPath>..\..\BuildOutPut</OutputPath>
+		<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
+		<DocumentationFile>..\..\BuildOutPut\Senparc.Weixin.TenPayV3.xml</DocumentationFile>
+		<Optimize>true</Optimize>
+		<DebugType>pdbonly</DebugType>
+		<ErrorReport>prompt</ErrorReport>
+		<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard2.1|AnyCPU'">
+		<OutputPath>..\..\BuildOutPut\</OutputPath>
+		<DocumentationFile>..\..\BuildOutPut\netstandard2.1\Senparc.Weixin.Open.xml</DocumentationFile>
+	</PropertyGroup>
+	<ItemGroup>
+		<None Include="..\..\Senparc.Weixin\icon.jpg" Pack="true" Visible="false" PackagePath="" />
+	</ItemGroup>
+	<ItemGroup>
+		<Compile Remove="Apis\Marketing\Entities\MarketingApis.Busifavor.cs" />
+		<Compile Remove="Properties\AssemblyInfo.cs" />
+	</ItemGroup>
+	<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' ">
+		<PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
+		<PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
+	</ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="Senparc.CO2NET.AspNet" Version="1.1.3.4" />
+		<PackageReference Include="System.Security.Cryptography.Cng" Version="5.0.0" />
+	</ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\..\Senparc.Weixin\Senparc.Weixin\Senparc.Weixin.net7.csproj" />
+	</ItemGroup>
+	<ItemGroup>
+		<PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" />
+	</ItemGroup>
 </Project>