lsm/DotNetCore.SKIT.FlurlHttpClient.Wechat
1
0
Fork 0
mirror of https://gitee.com/fudiwei/DotNetCore.SKIT.FlurlHttpClient.Wechat.git synced 2025-07-18 13:26:42 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(tenpayv2): 修复部分场景下付款码支付接口响应模型反序列化错误的问题

Browse Source
This commit is contained in:
Fu Diwei 2023-03-13 16:32:44 +08:00
parent ecaaee96f3
commit 3d7f59fe55
2 changed files with 116 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

213
src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/Pay/CreatePayMicroPayResponse.cs
View File

@ -9,135 +9,148 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models
{ {
public static class Types public static class Types
{ {
public class Promotion public class PromotionDetail
{ {
public static class Types public static class Types
{ {
public class GoodsDetail public class Promotion
{ {
/// <summary> public static class Types
/// 获取或设置商品编码。 {
/// </summary> public class GoodsDetail
[Newtonsoft.Json.JsonProperty("goods_id")] {
[System.Text.Json.Serialization.JsonPropertyName("goods_id")] /// <summary>
public string GoodsId { get; set; } = default!; /// 获取或设置商品编码。
/// </summary>
[Newtonsoft.Json.JsonProperty("goods_id")]
[System.Text.Json.Serialization.JsonPropertyName("goods_id")]
public string GoodsId { get; set; } = default!;
/// <summary>
/// 获取或设置商品数量。
/// </summary>
[Newtonsoft.Json.JsonProperty("quantity")]
[System.Text.Json.Serialization.JsonPropertyName("quantity")]
[System.Text.Json.Serialization.JsonNumberHandling(System.Text.Json.Serialization.JsonNumberHandling.AllowReadingFromString)]
public int Quantity { get; set; }
/// <summary>
/// 获取或设置商品单价（单位：分）。
/// </summary>
[Newtonsoft.Json.JsonProperty("price")]
[System.Text.Json.Serialization.JsonPropertyName("price")]
[System.Text.Json.Serialization.JsonNumberHandling(System.Text.Json.Serialization.JsonNumberHandling.AllowReadingFromString)]
public int Price { get; set; }
/// <summary>
/// 获取或设置商品优惠金额（单位：分）。
/// </summary>
[Newtonsoft.Json.JsonProperty("discount_amount")]
[System.Text.Json.Serialization.JsonPropertyName("discount_amount")]
[System.Text.Json.Serialization.JsonNumberHandling(System.Text.Json.Serialization.JsonNumberHandling.AllowReadingFromString)]
public int DiscountAmount { get; set; }
/// <summary>
/// 获取或设置商品备注。
/// </summary>
[Newtonsoft.Json.JsonProperty("goods_remark")]
[System.Text.Json.Serialization.JsonPropertyName("goods_remark")]
public string? GoodsRemark { get; set; }
}
}
/// <summary> /// <summary>
/// 获取或设置商品数量。 /// 获取或设置券或者立减优惠 ID。
/// </summary> /// </summary>
[Newtonsoft.Json.JsonProperty("quantity")] [Newtonsoft.Json.JsonProperty("promotion_id")]
[System.Text.Json.Serialization.JsonPropertyName("quantity")] [System.Text.Json.Serialization.JsonPropertyName("promotion_id")]
public string PromotionId { get; set; } = default!;
/// <summary>
/// 获取或设置优惠名称。
/// </summary>
[Newtonsoft.Json.JsonProperty("name")]
[System.Text.Json.Serialization.JsonPropertyName("name")]
public string? Name { get; set; }
/// <summary>
/// 获取或设置优惠范围。
/// </summary>
[Newtonsoft.Json.JsonProperty("scope")]
[System.Text.Json.Serialization.JsonPropertyName("scope")]
public string? Scope { get; set; }
/// <summary>
/// 获取或设置优惠类型。
/// </summary>
[Newtonsoft.Json.JsonProperty("type")]
[System.Text.Json.Serialization.JsonPropertyName("type")]
public string? Type { get; set; }
/// <summary>
/// 获取或设置优惠券面额（单位：分）。
/// </summary>
[Newtonsoft.Json.JsonProperty("amount")]
[System.Text.Json.Serialization.JsonPropertyName("amount")]
[System.Text.Json.Serialization.JsonNumberHandling(System.Text.Json.Serialization.JsonNumberHandling.AllowReadingFromString)] [System.Text.Json.Serialization.JsonNumberHandling(System.Text.Json.Serialization.JsonNumberHandling.AllowReadingFromString)]
public int Quantity { get; set; } public int Amount { get; set; }
/// <summary> /// <summary>
/// 获取或设置商品单价（单位：分）。 /// 获取或设置活动 ID。
/// </summary> /// </summary>
[Newtonsoft.Json.JsonProperty("price")] [Newtonsoft.Json.JsonProperty("activity_id")]
[System.Text.Json.Serialization.JsonPropertyName("price")] [System.Text.Json.Serialization.JsonPropertyName("activity_id")]
public string? ActivityId { get; set; }
/// <summary>
/// 获取或设置微信出资（单位：分）。
/// </summary>
[Newtonsoft.Json.JsonProperty("wxpay_contribute")]
[System.Text.Json.Serialization.JsonPropertyName("wxpay_contribute")]
[System.Text.Json.Serialization.JsonNumberHandling(System.Text.Json.Serialization.JsonNumberHandling.AllowReadingFromString)] [System.Text.Json.Serialization.JsonNumberHandling(System.Text.Json.Serialization.JsonNumberHandling.AllowReadingFromString)]
public int Price { get; set; } public int? WechatpayContribute { get; set; }
/// <summary> /// <summary>
/// 获取或设置商品优惠金额（单位：分）。 /// 获取或设置商户出资（单位：分）。
/// </summary> /// </summary>
[Newtonsoft.Json.JsonProperty("discount_amount")] [Newtonsoft.Json.JsonProperty("merchant_contribute")]
[System.Text.Json.Serialization.JsonPropertyName("discount_amount")] [System.Text.Json.Serialization.JsonPropertyName("merchant_contribute")]
[System.Text.Json.Serialization.JsonNumberHandling(System.Text.Json.Serialization.JsonNumberHandling.AllowReadingFromString)] [System.Text.Json.Serialization.JsonNumberHandling(System.Text.Json.Serialization.JsonNumberHandling.AllowReadingFromString)]
public int DiscountAmount { get; set; } public int? MerchantContribute { get; set; }
/// <summary> /// <summary>
/// 获取或设置商品备注。 /// 获取或设置其他出资（单位：分）。
/// </summary> /// </summary>
[Newtonsoft.Json.JsonProperty("goods_remark")] [Newtonsoft.Json.JsonProperty("other_contribute")]
[System.Text.Json.Serialization.JsonPropertyName("goods_remark")] [System.Text.Json.Serialization.JsonPropertyName("other_contribute")]
public string? GoodsRemark { get; set; } [System.Text.Json.Serialization.JsonNumberHandling(System.Text.Json.Serialization.JsonNumberHandling.AllowReadingFromString)]
public int? OtherContribute { get; set; }
/// <summary>
/// 获取或设置单品列表。
/// </summary>
[Newtonsoft.Json.JsonProperty("goods_detail")]
[System.Text.Json.Serialization.JsonPropertyName("goods_detail")]
public Types.GoodsDetail[]? GoodsList { get; set; }
} }
} }
/// <summary> /// <summary>
/// 获取或设置券或者立减优惠 ID。 /// 获取或设置优惠信息列表。
/// </summary> /// </summary>
[Newtonsoft.Json.JsonProperty("promotion_id")] [Newtonsoft.Json.JsonProperty("promotion_detail")]
[System.Text.Json.Serialization.JsonPropertyName("promotion_id")] [System.Text.Json.Serialization.JsonPropertyName("promotion_detail")]
public string PromotionId { get; set; } = default!; public Types.Promotion[]? PromotionList { get; set; }
/// <summary>
/// 获取或设置优惠名称。
/// </summary>
[Newtonsoft.Json.JsonProperty("name")]
[System.Text.Json.Serialization.JsonPropertyName("name")]
public string? Name { get; set; }
/// <summary>
/// 获取或设置优惠范围。
/// </summary>
[Newtonsoft.Json.JsonProperty("scope")]
[System.Text.Json.Serialization.JsonPropertyName("scope")]
public string? Scope { get; set; }
/// <summary>
/// 获取或设置优惠类型。
/// </summary>
[Newtonsoft.Json.JsonProperty("type")]
[System.Text.Json.Serialization.JsonPropertyName("type")]
public string? Type { get; set; }
/// <summary>
/// 获取或设置优惠券面额（单位：分）。
/// </summary>
[Newtonsoft.Json.JsonProperty("amount")]
[System.Text.Json.Serialization.JsonPropertyName("amount")]
[System.Text.Json.Serialization.JsonNumberHandling(System.Text.Json.Serialization.JsonNumberHandling.AllowReadingFromString)]
public int Amount { get; set; }
/// <summary>
/// 获取或设置活动 ID。
/// </summary>
[Newtonsoft.Json.JsonProperty("activity_id")]
[System.Text.Json.Serialization.JsonPropertyName("activity_id")]
public string? ActivityId { get; set; }
/// <summary>
/// 获取或设置微信出资（单位：分）。
/// </summary>
[Newtonsoft.Json.JsonProperty("wxpay_contribute")]
[System.Text.Json.Serialization.JsonPropertyName("wxpay_contribute")]
[System.Text.Json.Serialization.JsonNumberHandling(System.Text.Json.Serialization.JsonNumberHandling.AllowReadingFromString)]
public int? WechatpayContribute { get; set; }
/// <summary>
/// 获取或设置商户出资（单位：分）。
/// </summary>
[Newtonsoft.Json.JsonProperty("merchant_contribute")]
[System.Text.Json.Serialization.JsonPropertyName("merchant_contribute")]
[System.Text.Json.Serialization.JsonNumberHandling(System.Text.Json.Serialization.JsonNumberHandling.AllowReadingFromString)]
public int? MerchantContribute { get; set; }
/// <summary>
/// 获取或设置其他出资（单位：分）。
/// </summary>
[Newtonsoft.Json.JsonProperty("other_contribute")]
[System.Text.Json.Serialization.JsonPropertyName("other_contribute")]
[System.Text.Json.Serialization.JsonNumberHandling(System.Text.Json.Serialization.JsonNumberHandling.AllowReadingFromString)]
public int? OtherContribute { get; set; }
/// <summary>
/// 获取或设置单品列表。
/// </summary>
[Newtonsoft.Json.JsonProperty("goods_detail")]
[System.Text.Json.Serialization.JsonPropertyName("goods_detail")]
public Types.GoodsDetail[]? GoodsList { get; set; }
} }
} }
internal static class Converters internal static class Converters
{ {
internal class ResponsePropertyPromotionListNewtonsoftJsonConverter : Newtonsoft.Json.Converters.TextualObjectInJsonFormatConverterBase<Types.Promotion[]> internal class ResponsePropertyPromotionDetailNewtonsoftJsonConverter : Newtonsoft.Json.Converters.TextualObjectInJsonFormatConverterBase<Types.PromotionDetail>
{ {
} }
internal class ResponsePropertyPromotionListSystemTextJsonConverter : System.Text.Json.Converters.TextualObjectInJsonFormatConverterBase<Types.Promotion[]> internal class ResponsePropertyPromotionDetailSystemTextJsonConverter : System.Text.Json.Converters.TextualObjectInJsonFormatConverterBase<Types.PromotionDetail>
{ {
} }
} }
@ -303,9 +316,9 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models
/// 获取或设置优惠信息。 /// 获取或设置优惠信息。
/// </summary> /// </summary>
[Newtonsoft.Json.JsonProperty("promotion_detail")] [Newtonsoft.Json.JsonProperty("promotion_detail")]
[Newtonsoft.Json.JsonConverter(typeof(Converters.ResponsePropertyPromotionListNewtonsoftJsonConverter))] [Newtonsoft.Json.JsonConverter(typeof(Converters.ResponsePropertyPromotionDetailNewtonsoftJsonConverter))]
[System.Text.Json.Serialization.JsonPropertyName("promotion_detail")] [System.Text.Json.Serialization.JsonPropertyName("promotion_detail")]
[System.Text.Json.Serialization.JsonConverter(typeof(Converters.ResponsePropertyPromotionListSystemTextJsonConverter))] [System.Text.Json.Serialization.JsonConverter(typeof(Converters.ResponsePropertyPromotionDetailSystemTextJsonConverter))]
public Types.Promotion[]? PromotionList { get; set; } public Types.PromotionDetail? PromotionDetail { get; set; }
} }
} }

5
test/SKIT.FlurlHttpClient.Wechat.TenpayV2.UnitTests/ModelSamples/Pay/CreatePayMicroPayResponse.json
View File

@ -1,4 +1,4 @@
{ {
"return_code": "SUCCESS", "return_code": "SUCCESS",
"return_msg": "OK", "return_msg": "OK",
"appid": "wx2421b1c4370ec43b", "appid": "wx2421b1c4370ec43b",
@ -17,5 +17,6 @@
"transaction_id": "1008450740201411110005820873", "transaction_id": "1008450740201411110005820873",
"out_trade_no": "1415757673", "out_trade_no": "1415757673",
"attach": "订单额外描述", "attach": "订单额外描述",
"time_end": "20141111170043" "time_end": "20141111170043",
"promotion_detail": "{\"promotion_detail\":[{\"promotion_id\":\"42565506954\",\"name\":\"测罐战马0.5元券\",\"scope\":\"SINGLE\",\"type\":\"DISCOUNT\",\"amount\":50,\"activity_id\":\"17232399\",\"wxpay_contribute\":0,\"merchant_contribute\":50,\"other_contribute\":0,\"goods_detail\":[{\"goods_id\":\"6970440826666\",\"quantity\":1,\"price\":650,\"discount_amount\":50}]}]}"
} }