Skip to content

Commit

Permalink
Merge pull request #2757 from JeffreySu/Developer
Browse files Browse the repository at this point in the history 
TenpayV3 v0.6.8.3 MarketingApis.ModifyBusifavorStockBudgetAsync 方法单独提…
  • Loading branch information
@JeffreySu
JeffreySu authored Jan 7, 2023
2 parents 1fdf1e5 + 8f5b409 commit a455ffd
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 23 deletions.
13 changes: 4 additions & 9 deletions ....Weixin.TenPay/Senparc.Weixin.TenPayV3.Test/Apis/Marketing/MarketingBusifavorApisTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,6 @@
using Senparc.Weixin.TenPayV3.Apis.Marketing;
using Senparc.Weixin.TenPayV3.Entities;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace Senparc.Weixin.TenPayV3.Apis.Tests
{
Expand Down Expand Up @@ -313,10 +308,10 @@ public void ModifyBusifavorStockBudgetAsyncTest()

// TODO:流水号?这样是否有效?
var modify_budget_request_no = string.Format("{0}{1}{2}", TenPayV3Info.MchId/*10位*/, SystemTime.Now.ToString("yyyyMMddHHmmss"), TenPayV3Util.BuildRandomStr(6));
var requestData = new ModifyBusifavorStockBudgetRequestData(createBusifavorStockResult.stock_id, 20, null, null, null, modify_budget_request_no);
var requestData = new ModifyBusifavorStockBudgetRequestData(20, null, null, null, modify_budget_request_no);

var marketingApis = new MarketingApis();
var result = marketingApis.ModifyBusifavorStockBudgetAsync(requestData).GetAwaiter().GetResult();
var result = marketingApis.ModifyBusifavorStockBudgetAsync(createBusifavorStockResult.stock_id, requestData).GetAwaiter().GetResult();

Console.WriteLine("微信支付 V3 修改批次预算接口：" + result.ToJson(true));

Expand All @@ -342,10 +337,10 @@ public void ModifyBusifavorStockInformationAsyncTest()

// TODO:流水号?这样是否有效?
var out_request_no = string.Format("{0}{1}{2}", TenPayV3Info.MchId/*10位*/, SystemTime.Now.ToString("yyyyMMddHHmmss"), TenPayV3Util.BuildRandomStr(6));
var requestData = new ModifyBusifavorStockInformationRequestData(createBusifavorStockResult.stock_id, null, "Senparc微信支付V3商家券测试-修改", null, null, out_request_no, null, null, null, null);
var requestData = new ModifyBusifavorStockInformationRequestData(null, "Senparc微信支付V3商家券测试-修改", null, null, out_request_no, null, null, null, null);

var marketingApis = new MarketingApis();
var result = marketingApis.ModifyBusifavorStockInformationAsync(requestData).GetAwaiter().GetResult();
var result = marketingApis.ModifyBusifavorStockInformationAsync(createBusifavorStockResult.stock_id, requestData).GetAwaiter().GetResult();

Console.WriteLine("微信支付 V3 修改商家券基本信息接口：" + result.ToJson(true));

Expand Down
15 changes: 4 additions & 11 deletions ...xin.TenPayV3/Apis/Marketing/Entities/RequestData/ModifyBusifavorStockBudgetRequestData.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ and limitations under the License.
创建标识：Senparc - 20210914
修改标识：Senparc - 20230107
修改描述：v0.6.8.3 更新 ModifyBusifavorStockBudgetRequestData 参数，删除 stock_id
----------------------------------------------------------------*/

using Senparc.Weixin.TenPayV3.Entities;
Expand All @@ -48,15 +51,13 @@ public class ModifyBusifavorStockBudgetRequestData
/// <summary>
/// 含参构造函数
/// </summary>
/// <param name="stock_id">批次号 <para>path批次号</para><para>示例值：98065001</para></param>
/// <param name="target_max_coupons">目标批次最大发放个数 <para>body批次最大发放个数</para><para>注：目标批次即修改后的批次</para><para>示例值：3000</para><para>target_max_coupons和target_max_coupons_by_day二选一</para></param>
/// <param name="target_max_coupons_by_day">目标单天发放上限个数 <para>body单天发放上限个数</para><para>注：目标批次即修改后的批次</para><para>示例值：500</para><para>target_max_coupons和target_max_coupons_by_day二选一</para></param>
/// <param name="current_max_coupons">当前批次最大发放个数 <para>body当前批次最大发放个数，当传入target_max_coupons大于0时，current_max_coupons必传</para><para>注：当前批次即未修改的批次</para><para>示例值：500</para><para>可为null</para></param>
/// <param name="current_max_coupons_by_day">当前单天发放上限个数 <para>body当前单天发放上限个数，当传入target_max_coupons_by_day大于0时，current_max_coupons_by_day必填</para><para>注：当前批次即未修改的批次</para><para>示例值：300</para><para>可为null</para></param>
/// <param name="modify_budget_request_no">修改预算请求单据号 <para>body修改预算请求单据号</para><para>示例值：1002600620019090123143254436</para></param>
public ModifyBusifavorStockBudgetRequestData(string stock_id, int? target_max_coupons, int? target_max_coupons_by_day, int? current_max_coupons, int? current_max_coupons_by_day, string modify_budget_request_no)
public ModifyBusifavorStockBudgetRequestData( int? target_max_coupons, int? target_max_coupons_by_day, int? current_max_coupons, int? current_max_coupons_by_day, string modify_budget_request_no)
{
this.stock_id = stock_id;
this.target_max_coupons = target_max_coupons;
this.target_max_coupons_by_day = target_max_coupons_by_day;
this.current_max_coupons = current_max_coupons;
Expand All @@ -71,14 +72,6 @@ public ModifyBusifavorStockBudgetRequestData()
{
}

/// <summary>
/// 批次号
/// <para>path批次号 </para>
/// <para>示例值：98065001</para>
/// </summary>
[JsonIgnore]
public string stock_id { get; set; }

/// <summary>
/// 目标批次最大发放个数
/// <para>body批次最大发放个数 </para>
Expand Down
1 change: 1 addition & 0 deletions ...enPayV3/Apis/Marketing/Entities/RequestData/ModifyBusifavorStockInformationRequestData.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ and limitations under the License.
修改标识：Senparc - 20230106
修改描述：v0.6.8.2 更新 ModifyBusifavorStockInformationRequestData 参数，删除 stock_id
----------------------------------------------------------------*/

using Senparc.Weixin.TenPayV3.Entities;
Expand Down
11 changes: 9 additions & 2 deletions src/Senparc.Weixin.TenPay/Senparc.Weixin.TenPayV3/Apis/Marketing/MarketingApis.Busifavor.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,12 @@ and limitations under the License.
修改标识：iwenli210 - 20211130
修改描述：修复PayV3营销工具商户券API
修改标识：Senparc - 20220106
修改描述：v0.6.8.2 MarketingApis.ModifyBusifavorStockInformationAsync 方法单独提取参数 stock_id
修改标识：Senparc - 20220107
修改描述：v0.6.8.3 MarketingApis.ModifyBusifavorStockBudgetAsync 方法单独提取参数 stock_id
----------------------------------------------------------------*/


Expand Down Expand Up @@ -226,13 +232,14 @@ public async Task<DisassociateBusifavorReturnJson> DisassociateBusifavorAsync(Di
/// <para>商户可以通过该接口修改批次单天发放上限数量或者批次最大发放数量</para>
/// <para>更多详细请参考 https://pay.weixin.qq.com/wiki/doc/apiv3/apis/chapter9_2_11.shtml </para>
/// </summary>
/// <param name="stock_id">批次号 <para>path批次号</para><para>示例值：98065001</para></param>
/// <param name="data">微信支付需要POST的Data数据</param>
/// <param name="timeOut">超时时间，单位为ms </param>
/// <returns></returns>
public async Task<ModifyBusifavorStockBudgetReturnJson> ModifyBusifavorStockBudgetAsync(ModifyBusifavorStockBudgetRequestData data, int timeOut = Config.TIME_OUT)
public async Task<ModifyBusifavorStockBudgetReturnJson> ModifyBusifavorStockBudgetAsync(string stock_id, ModifyBusifavorStockBudgetRequestData data, int timeOut = Config.TIME_OUT)
{

var url = BasePayApis.GetPayApiUrl($"{Senparc.Weixin.Config.TenPayV3Host}/{{0}}v3/marketing/busifavor/stocks/{data.stock_id}/budget");
var url = BasePayApis.GetPayApiUrl($"{Senparc.Weixin.Config.TenPayV3Host}/{{0}}v3/marketing/busifavor/stocks/{stock_id}/budget");
TenPayApiRequest tenPayApiRequest = new(_tenpayV3Setting);
return await tenPayApiRequest.RequestAsync<ModifyBusifavorStockBudgetReturnJson>(url, data, timeOut, ApiRequestMethod.PATCH);
}
Expand Down
2 changes: 1 addition & 1 deletion src/Senparc.Weixin.TenPay/Senparc.Weixin.TenPayV3/Senparc.Weixin.TenPayV3.net7.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<Version>0.6.8.2</Version>
<Version>0.6.8.3</Version>
<AssemblyName>Senparc.Weixin.TenPayV3</AssemblyName>
<RootNamespace>Senparc.Weixin.TenPayV3</RootNamespace>
<LangVersion>10.0</LangVersion>
Expand Down

0 comments on commit a455ffd

Please sign in to comment.