diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCardInvoiceExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCardInvoiceExtensions.cs index c7e3edc3..87dc96d4 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCardInvoiceExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCardInvoiceExtensions.cs @@ -175,7 +175,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request.AppId == null) request.AppId = client.Credentials.AppId; - if (request.CardExtra != null && string.IsNullOrEmpty(request.CardExtra.Nonce)) + if (request.CardExtra != null && request.CardExtra.Nonce == null) request.CardExtra.Nonce = Guid.NewGuid().ToString("N"); IFlurlRequest flurlReq = client diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteUnionPromoterExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteUnionPromoterExtensions.cs index 49dfd12e..400aeb5e 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteUnionPromoterExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteUnionPromoterExtensions.cs @@ -138,34 +138,34 @@ namespace SKIT.FlurlHttpClient.Wechat.Api .SetQueryParam("from", request.Offset) .SetQueryParam("limit", request.Limit); - if (request.QueryType.HasValue) + if (request.QueryType != null) flurlReq.SetQueryParam("queryType", request.QueryType.Value); if (request.Query != null) flurlReq.SetQueryParam("query", request.Query); - if (request.MaxPrice.HasValue) + if (request.MaxPrice != null) flurlReq.SetQueryParam("maxPrice", request.MaxPrice.Value); - if (request.MinPrice.HasValue) + if (request.MinPrice != null) flurlReq.SetQueryParam("minPrice", request.MinPrice.Value); - if (request.MinCommissionValue.HasValue) + if (request.MinCommissionValue != null) flurlReq.SetQueryParam("minCommissionValue", request.MinCommissionValue.Value); - if (request.MinCommissionRatio.HasValue) + if (request.MinCommissionRatio != null) flurlReq.SetQueryParam("minCommissionRatio", request.MinCommissionRatio.Value); - if (request.SortType.HasValue) + if (request.SortType != null) flurlReq.SetQueryParam("sortType", request.SortType.Value); - if (request.HasCoupon.HasValue) + if (request.HasCoupon != null) flurlReq.SetQueryParam("hasCoupon", request.HasCoupon.Value ? 1 : 0); if (request.ShopAppIdList != null) flurlReq.SetQueryParam("shopAppIds", string.Join(",", request.ShopAppIdList)); - if (request.CategoryId.HasValue) + if (request.CategoryId != null) flurlReq.SetQueryParam("categoryId", request.CategoryId); if (request.CategoryIdList != null) @@ -199,28 +199,28 @@ namespace SKIT.FlurlHttpClient.Wechat.Api .SetQueryParam("from", request.Offset) .SetQueryParam("limit", request.Limit); - if (request.MaxPrice.HasValue) + if (request.MaxPrice != null) flurlReq.SetQueryParam("maxPrice", request.MaxPrice.Value); - if (request.MinPrice.HasValue) + if (request.MinPrice != null) flurlReq.SetQueryParam("minPrice", request.MinPrice.Value); - if (request.MinCommissionValue.HasValue) + if (request.MinCommissionValue != null) flurlReq.SetQueryParam("minCommissionValue", request.MinCommissionValue.Value); - if (request.MinCommissionRatio.HasValue) + if (request.MinCommissionRatio != null) flurlReq.SetQueryParam("minCommissionRatio", request.MinCommissionRatio.Value); - if (request.SortType.HasValue) + if (request.SortType != null) flurlReq.SetQueryParam("sortType", request.SortType.Value); - if (request.HasCoupon.HasValue) + if (request.HasCoupon != null) flurlReq.SetQueryParam("hasCoupon", request.HasCoupon.Value ? 1 : 0); if (request.ShopAppIdList != null) flurlReq.SetQueryParam("shopAppIds", string.Join(",", request.ShopAppIdList)); - if (request.CategoryId.HasValue) + if (request.CategoryId != null) flurlReq.SetQueryParam("categoryId", request.CategoryId); if (request.CategoryIdList != null) @@ -302,10 +302,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Api .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("page", request.Page); - if (request.StartTimestamp.HasValue) + if (request.StartTimestamp != null) flurlReq.SetQueryParam("startTimestamp", request.StartTimestamp.Value); - if (request.EndTimestamp.HasValue) + if (request.EndTimestamp != null) flurlReq.SetQueryParam("endTimestamp", request.EndTimestamp.Value); if (request.CommissionStatus != null) diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteWxaApiExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteWxaApiExtensions.cs index fc6cbfc6..9d41e00f 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteWxaApiExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteWxaApiExtensions.cs @@ -163,7 +163,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api .SetQueryParam("page", request.Page) .SetQueryParam("num", request.Limit); - if (request.Type.HasValue) + if (request.Type != null) flurlReq.SetQueryParam("type", request.Type); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -301,13 +301,13 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request.FilterMessage != null) flurlReq.SetQueryParam("filterMsg", request.FilterMessage); - if (request.LogLevel.HasValue) + if (request.LogLevel != null) flurlReq.SetQueryParam("level", request.LogLevel.Value); - if (request.Offset.HasValue) + if (request.Offset != null) flurlReq.SetQueryParam("start", request.Offset.Value); - if (request.Limit.HasValue) + if (request.Limit != null) flurlReq.SetQueryParam("limit", request.Limit.Value); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -994,13 +994,13 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request.Keyword != null) flurlReq.SetQueryParam("keyword", request.Keyword); - if (request.Role.HasValue) + if (request.Role != null) flurlReq.SetQueryParam("role", request.Role.Value); - if (request.Offset.HasValue) + if (request.Offset != null) flurlReq.SetQueryParam("offset", request.Offset.Value); - if (request.Limit.HasValue) + if (request.Limit != null) flurlReq.SetQueryParam("limit", request.Limit.Value); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteWxaComponentExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteWxaComponentExtensions.cs index b664e5a9..4557c3d1 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteWxaComponentExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteWxaComponentExtensions.cs @@ -610,7 +610,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api if (request.Action != null) flurlReq.SetQueryParam("action", request.Action); - if (request.AppVersion.HasValue) + if (request.AppVersion != null) flurlReq.SetQueryParam("app_version", request.AppVersion.Value); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/WechatApiClient.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/WechatApiClient.cs index 9576994e..b8877006 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/WechatApiClient.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/WechatApiClient.cs @@ -58,7 +58,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api { IFlurlRequest flurlRequest = FlurlClient.Request(urlSegments).WithVerb(method); - if (request.Timeout.HasValue) + if (request.Timeout != null) { flurlRequest.WithTimeout(TimeSpan.FromMilliseconds(request.Timeout.Value)); }