Skip to content

Commit

Permalink
update to 8.1
Browse files Browse the repository at this point in the history
  • Loading branch information
niltor committed Feb 13, 2025
1 parent 9aaac23 commit ee9595b
Show file tree
Hide file tree
Showing 459 changed files with 4,882 additions and 3,213 deletions.
19 changes: 4 additions & 15 deletions src/AspNetCore/PddOpenSdk.AspNetCore.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net8.0;net6.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<AssemblyName>PddOpenSdk.AspNetCore</AssemblyName>
<RootNamespace>PddOpenSdk.AspNetCore</RootNamespace>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
Expand All @@ -11,8 +11,8 @@
<Description>拼多多SDK ASP.NET Core依赖包</Description>
<PackageProjectUrl>https://github.com/niltor/open-pdd-net-sdk</PackageProjectUrl>
<RepositoryUrl>https://github.com/niltor/open-pdd-net-sdk</RepositoryUrl>
<PackageReleaseNotes>
同步官方接口到最新(202410);
<PackageReleaseNotes>1. 同步官方接口到最新(20250213);
2. 移除对.net6.0的支持;
</PackageReleaseNotes>
<AssemblyVersion>0.1.0.0</AssemblyVersion>
<FileVersion>0.1.0.0</FileVersion>
Expand All @@ -21,7 +21,7 @@
<PackageLicenseUrl></PackageLicenseUrl>
<PackageIcon>logo.jpg</PackageIcon>
<PackageId>MSDev.PddOpenSdk.AspNetCore</PackageId>
<Version>8.0.10</Version>
<Version>8.0.11</Version>
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
<ProduceReferenceAssembly>True</ProduceReferenceAssembly>
</PropertyGroup>
Expand All @@ -34,17 +34,6 @@
<GenerateDocumentationFile>True</GenerateDocumentationFile>
</PropertyGroup>


<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="6.0.0" />
<PackageReference Include="Websocket.Client" Version="4.3.38" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.1" />
Expand Down
1 change: 1 addition & 0 deletions src/AspNetCore/PddService.cs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
using PddOpenSdk.Models;
namespace PddOpenSdk.AspNetCore;
/// <summary>
/// 批多多服务
Expand Down
4 changes: 3 additions & 1 deletion src/Console/Helpers/NameHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ public static string GetAttributionName(string name, string type, long isMust =
}

string attributionName;
string defaultValue = string.Empty;
var isArray = false;

//name = name.ToLower();
Expand Down Expand Up @@ -56,6 +57,7 @@ public static string GetAttributionName(string name, string type, long isMust =
if (hasChild)
{
type = Function.ToPascalCase(name + modelType);
type = isMust == 0 ? $"{type}?" : type;
}
else
{
Expand All @@ -71,7 +73,7 @@ public static string GetAttributionName(string name, string type, long isMust =
// 可使用复数形式
type = isMust == 0 ? $"List<{type}>?" : $"List<{type}>";
}
attributionName = $"public {type} {name} {{ get; set; }}" + Environment.NewLine;
attributionName = $"public {type} {name} {{ get; set; }}{defaultValue}" + Environment.NewLine;
return attributionName;
}
}
4 changes: 2 additions & 2 deletions src/Console/Helpers/PddApiDocHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -188,12 +188,12 @@ public async Task Run(bool isUpdate = false)
}
var docDetail = await GetDocDetailByIdAsync(pddDocInfo.Id);
methodsContent += BuildRequestMethod(docDetail, className);
System.Console.WriteLine($"[{totalNumber}]" + docDetail.ScopeName + "...✅");
System.Console.WriteLine($"[{totalNumber}]" + docDetail.ScopeName);
}
SaveApiClass(className, methodsContent);
}
});
System.Console.WriteLine("Get All " + totalNumber + " Api");
System.Console.WriteLine("Get All " + totalNumber + " Api");
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public partial class AuthDdkGoodsPromotionRight
/// 商品图片素材url列表,0到3张图
/// </summary>
[JsonPropertyName("thumb_pic_url")]
public List<string> ThumbPicUrl { get; set; }
public List<string?>? ThumbPicUrl { get; set; }



Expand Down
6 changes: 3 additions & 3 deletions src/PddOpenSdk/Models/Request/Ddk/CreateDdkCashgift.cs
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ public partial class CreateDdkCashgift
/// 商品goodsSign列表,例如:["c9r2omogKFFAc7WBwvbZU1ikIb16_J3CTa8HNN"],最多可支持传20个商品。创建普通满减礼金、免单礼金和灵活面额礼金时,该字段必填;创建不限商品满减礼金时,该字段传空。goodsSign使用说明:https://jinbao.pinduoduo.com/qa-system?questionId=252
/// </summary>
[JsonPropertyName("goods_sign_list")]
public List<string> GoodsSignList { get; set; }
public List<string?>? GoodsSignList { get; set; }

/// <summary>
/// 活动单链接可领券数量,默认无限制,最小值为1。
Expand All @@ -89,13 +89,13 @@ public partial class CreateDdkCashgift
/// 礼金名称
/// </summary>
[JsonPropertyName("name")]
public string Name { get; set; }
public string? Name { get; set; }

/// <summary>
/// 可使用推广位列表,例如:["60005_612"]。(列表中的PID方可推广该礼金)
/// </summary>
[JsonPropertyName("p_id_list")]
public List<string> PIdList { get; set; }
public List<string?>? PIdList { get; set; }

/// <summary>
/// 礼金券数量,创建普通满减礼金、不限商品满减礼金或免单礼金时,该字段必填;创建灵活面额礼金时,礼金券数量不固定,礼金总预算用完为止,该字段不传
Expand Down
24 changes: 12 additions & 12 deletions src/PddOpenSdk/Models/Request/Ddk/DetailDdkGoods.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ public partial class DetailDdkGoods
/// 自定义参数,为链接打上自定义标签;自定义参数最长限制64个字节;格式为: {"uid":"11111","sid":"22222"} ,其中 uid 用户唯一标识,可自行加密后传入,每个用户仅且对应一个标识,必填; sid 上下文信息标识,例如sessionId等,非必填。该json字符串中也可以加入其他自定义的key。(如果使用GET请求,请使用URLEncode处理参数)
/// </summary>
[JsonPropertyName("custom_parameters")]
public string CustomParameters { get; set; }
public string? CustomParameters { get; set; }

/// <summary>
/// 商品主图类型:1-场景图,2-白底图,默认为0
Expand All @@ -17,7 +17,7 @@ public partial class DetailDdkGoods
/// 商品goodsSign,支持通过goodsSign查询商品。goodsSign是加密后的goodsId, goodsId已下线,请使用goodsSign来替代。使用说明:https://jinbao.pinduoduo.com/qa-system?questionId=252
/// </summary>
[JsonPropertyName("goods_sign")]
public string GoodsSign { get; set; }
public string? GoodsSign { get; set; }

/// <summary>
/// 是否获取sku信息,默认false不返回。(特殊渠道权限,需额外申请)
Expand All @@ -29,40 +29,40 @@ public partial class DetailDdkGoods
/// 推广位id
/// </summary>
[JsonPropertyName("pid")]
public string Pid { get; set; }
public string? Pid { get; set; }

/// <summary>
/// 风控参数
/// </summary>
[JsonPropertyName("risk_params")]
public Dictionary<string, object>? RiskParams { get; set; }

/// <summary>
/// 搜索id,建议填写,提高收益。来自pdd.ddk.goods.recommend.get、pdd.ddk.goods.search、pdd.ddk.top.goods.list.query等接口
/// </summary>
[JsonPropertyName("search_id")]
public string SearchId { get; set; }
public string? SearchId { get; set; }

/// <summary>
/// 招商多多客ID
/// </summary>
[JsonPropertyName("zs_duo_id")]
public long? ZsDuoId { get; set; }

/// <summary>
/// 风控参数
/// </summary>
[JsonPropertyName("risk_params")]
public Dictionary<string, object> RiskParams { get; set; }


public partial class RiskParamsModel
{
/// <summary>
/// 风控参数key
/// </summary>
[JsonPropertyName("$key")]
public string Key { get; set; }
public string? Key { get; set; }

/// <summary>
/// 风控参数value
/// </summary>
[JsonPropertyName("$value")]
public string Value { get; set; }
public string? Value { get; set; }



Expand Down
2 changes: 1 addition & 1 deletion src/PddOpenSdk/Models/Request/Ddk/GenDdkGoodsZsUnitUrl.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ public partial class GenDdkGoodsZsUnitUrl
/// 自定义参数,为链接打上自定义标签;自定义参数最长限制64个字节;格式为: {"uid":"11111","sid":"22222"} ,其中 uid 用户唯一标识,可自行加密后传入,每个用户仅且对应一个标识,必填; sid 上下文信息标识,例如sessionId等,非必填。该json字符串中也可以加入其他自定义的key。若进行cid投放,转链的时候不填充custom_parameters,后续在推广前原始链接上拼接custom_parameters。(如果使用GET请求,请使用URLEncode处理参数)
/// </summary>
[JsonPropertyName("custom_parameters")]
public string CustomParameters { get; set; }
public string? CustomParameters { get; set; }

/// <summary>
/// 是否生成微信shortlink链接,仅支持单品,单个渠道每天生成的shortLink数量有限,请合理生成shortLink链接
Expand Down
10 changes: 2 additions & 8 deletions src/PddOpenSdk/Models/Request/Ddk/GenDdkResourceUrl.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,7 @@ public partial class GenDdkResourceUrl
/// 自定义参数,为链接打上自定义标签;自定义参数最长限制64个字节;格式为: {"uid":"11111","sid":"22222"} ,其中 uid 用户唯一标识,可自行加密后传入,每个用户仅且对应一个标识,必填; sid 上下文信息标识,例如sessionId等,非必填。该json字符串中也可以加入其他自定义的key
/// </summary>
[JsonPropertyName("custom_parameters")]
public string CustomParameters { get; set; }

/// <summary>
/// 是否返回 schema URL
/// </summary>
[JsonPropertyName("generate_schema_url")]
public bool? GenerateSchemaUrl { get; set; }
public string? CustomParameters { get; set; }

/// <summary>
/// 是否生成拼多多福利券微信小程序推广信息
Expand All @@ -35,7 +29,7 @@ public partial class GenDdkResourceUrl
/// 原链接
/// </summary>
[JsonPropertyName("url")]
public string Url { get; set; }
public string? Url { get; set; }



Expand Down
4 changes: 2 additions & 2 deletions src/PddOpenSdk/Models/Request/Ddk/GenDdkWeappQrcodeUrl.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public partial class GenDdkWeappQrcodeUrl
/// 自定义参数,为链接打上自定义标签;自定义参数最长限制64个字节;格式为: {"uid":"11111","sid":"22222"} ,其中 uid 用户唯一标识,可自行加密后传入,每个用户仅且对应一个标识,必填; sid 上下文信息标识,例如sessionId等,非必填。该json字符串中也可以加入其他自定义的key
/// </summary>
[JsonPropertyName("custom_parameters")]
public string CustomParameters { get; set; }
public string? CustomParameters { get; set; }

/// <summary>
/// 是否生成店铺收藏券推广链接
Expand All @@ -23,7 +23,7 @@ public partial class GenDdkWeappQrcodeUrl
/// 商品goodsSign列表,支持通过goodsSign查询商品。goodsSign是加密后的goodsId, goodsId已下线,请使用goodsSign来替代。使用说明:https://jinbao.pinduoduo.com/qa-system?questionId=252
/// </summary>
[JsonPropertyName("goods_sign_list")]
public List<string> GoodsSignList { get; set; }
public List<string?>? GoodsSignList { get; set; }

/// <summary>
/// 推广位ID
Expand Down
6 changes: 3 additions & 3 deletions src/PddOpenSdk/Models/Request/Ddk/GenerateDdkCmsPromUrl.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public partial class GenerateDdkCmsPromUrl
/// 自定义参数,为链接打上自定义标签;自定义参数最长限制64个字节;格式为: {"uid":"11111","sid":"22222"} ,其中 uid 用户唯一标识,可自行加密后传入,每个用户仅且对应一个标识,必填; sid 上下文信息标识,例如sessionId等,非必填。该json字符串中也可以加入其他自定义的key。(如果使用GET请求,请使用URLEncode处理参数)
/// </summary>
[JsonPropertyName("custom_parameters")]
public string CustomParameters { get; set; }
public string? CustomParameters { get; set; }

/// <summary>
/// 是否生成手机跳转链接。true-是,false-否,默认false
Expand Down Expand Up @@ -47,13 +47,13 @@ public partial class GenerateDdkCmsPromUrl
/// 搜索关键词
/// </summary>
[JsonPropertyName("keyword")]
public string Keyword { get; set; }
public string? Keyword { get; set; }

/// <summary>
/// 语言代码,生成跨境商城时有效
/// </summary>
[JsonPropertyName("language_code")]
public string LanguageCode { get; set; }
public string? LanguageCode { get; set; }

/// <summary>
/// 单人团多人团标志。true-多人团,false-单人团 默认false
Expand Down
2 changes: 1 addition & 1 deletion src/PddOpenSdk/Models/Request/Ddk/GenerateDdkGoodsPid.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public partial class GenerateDdkGoodsPid
/// 推广位名称,例如["1","2"]
/// </summary>
[JsonPropertyName("p_id_name_list")]
public List<string> PIdNameList { get; set; }
public List<string?>? PIdNameList { get; set; }

/// <summary>
/// 媒体id
Expand Down
20 changes: 10 additions & 10 deletions src/PddOpenSdk/Models/Request/Ddk/GenerateDdkGoodsPromotionUrl.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ public partial class GenerateDdkGoodsPromotionUrl
/// 自定义礼金标题,用于向用户展示渠道专属福利,不超过12个字
/// </summary>
[JsonPropertyName("cash_gift_name")]
public string CashGiftName { get; set; }
public string? CashGiftName { get; set; }

/// <summary>
/// 自定义参数,为链接打上自定义标签;自定义参数最长限制64个字节;格式为: {"uid":"11111","sid":"22222"} ,其中 uid 用户唯一标识,可自行加密后传入,每个用户仅且对应一个标识,必填; sid 上下文信息标识,例如sessionId等,非必填。该json字符串中也可以加入其他自定义的key。若进行cid投放,生链的时候不填充custom_parameters,后续在推广前原始链接上拼接custom_parameters。(如果使用GET请求,请使用URLEncode处理参数)
/// </summary>
[JsonPropertyName("custom_parameters")]
public string CustomParameters { get; set; }
public string? CustomParameters { get; set; }

/// <summary>
/// 是否生成带授权的单品链接。如果未授权,则会走授权流程
Expand Down Expand Up @@ -77,19 +77,19 @@ public partial class GenerateDdkGoodsPromotionUrl
/// 支持拼接特殊参数的商品生链参数列表。生链优先级:goods_gen_url_param_list > goods_sign_list,两者按优先级选其一。
/// </summary>
[JsonPropertyName("goods_gen_url_param_list")]
public List<GoodsGenUrlParamListModel> GoodsGenUrlParamList { get; set; }
public List<GoodsGenUrlParamListModel?>? GoodsGenUrlParamList { get; set; }

/// <summary>
/// 商品goodsSign列表,例如:["c9r2omogKFFAc7WBwvbZU1ikIb16_J3CTa8HNN"],支持批量生链。goodsSign是加密后的goodsId, goodsId已下线,请使用goodsSign来替代。使用说明:https://jinbao.pinduoduo.com/qa-system?questionId=252
/// </summary>
[JsonPropertyName("goods_sign_list")]
public List<string> GoodsSignList { get; set; }
public List<string?>? GoodsSignList { get; set; }

/// <summary>
/// 素材ID,可以通过商品详情接口获取商品素材信息
/// </summary>
[JsonPropertyName("material_id")]
public string MaterialId { get; set; }
public string? MaterialId { get; set; }

/// <summary>
/// true--生成多人团推广链接 false--生成单人团推广链接(默认false)1、单人团推广链接:用户访问单人团推广链接,可直接购买商品无需拼团。2、多人团推广链接:用户访问双人团推广链接开团,若用户分享给他人参团,则开团者和参团者的佣金均结算给推手
Expand All @@ -107,13 +107,13 @@ public partial class GenerateDdkGoodsPromotionUrl
/// 搜索id,建议填写,提高收益。来自pdd.ddk.goods.recommend.get、pdd.ddk.goods.search、pdd.ddk.top.goods.list.query等接口
/// </summary>
[JsonPropertyName("search_id")]
public string SearchId { get; set; }
public string? SearchId { get; set; }

/// <summary>
/// 特殊参数
/// </summary>
[JsonPropertyName("special_params")]
public Dictionary<string, object> SpecialParams { get; set; }
public Dictionary<string, object>? SpecialParams { get; set; }

/// <summary>
/// 生成商品链接类型 0-默认 1-百补相似品列表
Expand All @@ -140,19 +140,19 @@ public partial class GoodsGenUrlParamListModel
/// 商品goodsSign,支持通过goodsSign查询商品。goodsSign是加密后的goodsId, goodsId已下线,请使用goodsSign来替代。使用说明:https://jinbao.pinduoduo.com/qa-system?questionId=252
/// </summary>
[JsonPropertyName("goods_sign")]
public string GoodsSign { get; set; }
public string? GoodsSign { get; set; }

/// <summary>
/// 需要在链接上拼接的skuIdCode列表,skuIdCode为skuId密文,由订单详情接口pdd.ddk.order.detail.get返回。要求拥有sku权限否则不生效,作用同sku_id_list,且与sku_id_list独立。此列表传入n个skuIdCode,则针对该goodsSign生成n个拼接sku_id=xxx(skuIdCode)的链接。若列表为空或者skuIdCode无效则返回普通链接
/// </summary>
[JsonPropertyName("sku_id_code_list")]
public List<string> SkuIdCodeList { get; set; }
public List<string?>? SkuIdCodeList { get; set; }

/// <summary>
/// 需要在链接上拼接的skuId列表,要求拥有sku权限否则不生效。拼接sku_id的链接在点击跳转商详时,自动选中对应的sku。此列表传入n个skuId,则针对该goodsSign生成n个拼接sku_id链接。若列表为空或着skuId无效(null,非正)则返回普通链接。
/// </summary>
[JsonPropertyName("sku_id_list")]
public List<long?> SkuIdList { get; set; }
public List<long?>? SkuIdList { get; set; }



Expand Down
Loading

0 comments on commit ee9595b

Please sign in to comment.