From 34af822157753e1614beab6894b5797c91bccb18 Mon Sep 17 00:00:00 2001 From: sunpengfei <i@angelzzz.com> Date: 星期一, 01 九月 2025 15:10:32 +0800 Subject: [PATCH] feat:开发 --- FlexJobApi.Core/Models/UserServer/EnterpriseWallets/Commands/AlipayFundExpandindirectImageUploadCommand.cs | 15 ++ FlexJobApi.Core/Models/UserServer/EnterpriseWallets/Commands/AlipayFundExpandindirectCreateNotifyCommand.cs | 53 +++++++ FlexJobApi.UserServer.Application/EnterpriseWallets/Commands/AlipayFundExpandindirectCreateCommandHandler.cs | 37 +++++ FlexJobApi.Core/FlexJobApi.Core.xml | 155 ++++++++++++++++++++++ FlexJobApi.Core/Utils/AlipayUtils/AlipayUtils.cs | 12 + FlexJobApi.UserServer.Application/FlexJobApi.UserServer.Application.xml | 18 ++ FlexJobApi.Core/Models/UserServer/Users/Queries/GetPersonalLoginInfoQuery.cs | 7 + FlexJobApi.Core/Models/UserServer/EnterpriseWallets/Commands/AlipayFundExpandindirectCreateCommand.cs | 110 +++++++++++++++ FlexJobApi.Web.Entry/appsettings.json | 4 FlexJobApi.Core/FlexJobApi.Core.csproj | 1 FlexJobApi.UserServer.Application/FlexJobApi.UserServer.Application.csproj | 4 11 files changed, 409 insertions(+), 7 deletions(-) diff --git a/FlexJobApi.Core/FlexJobApi.Core.csproj b/FlexJobApi.Core/FlexJobApi.Core.csproj index 350fb8f..5656242 100644 --- a/FlexJobApi.Core/FlexJobApi.Core.csproj +++ b/FlexJobApi.Core/FlexJobApi.Core.csproj @@ -44,7 +44,6 @@ <Folder Include="Models\CommonServer\Schedules\Commands\" /> <Folder Include="Models\CommonServer\Schedules\Queries\" /> <Folder Include="Models\FlexJobServer\TaskUsers\Repositories\" /> - <Folder Include="Models\UserServer\EnterpriseWallets\Commands\" /> </ItemGroup> </Project> diff --git a/FlexJobApi.Core/FlexJobApi.Core.xml b/FlexJobApi.Core/FlexJobApi.Core.xml index 62f6154..d802435 100644 --- a/FlexJobApi.Core/FlexJobApi.Core.xml +++ b/FlexJobApi.Core/FlexJobApi.Core.xml @@ -9312,6 +9312,161 @@ 鏄惁宸查厤缃� </summary> </member> + <member name="T:FlexJobApi.Core.AlipayFundExpandindirectCreateCommand"> + <summary> + 鏀粯瀹濊祫閲戜簩绾у晢鎴稫YB浠h繘浠� + </summary> + </member> + <member name="P:FlexJobApi.Core.AlipayFundExpandindirectCreateCommand.ProductCode"> + <summary> + 浜у搧鐮� + </summary> + </member> + <member name="P:FlexJobApi.Core.AlipayFundExpandindirectCreateCommand.BizScene"> + <summary> + 鍦烘櫙鐮� + </summary> + </member> + <member name="P:FlexJobApi.Core.AlipayFundExpandindirectCreateCommand.OutBizNo"> + <summary> + 澶栭儴鍗曞彿 + </summary> + </member> + <member name="P:FlexJobApi.Core.AlipayFundExpandindirectCreateCommand.Identity"> + <summary> + 浜岀骇鍟嗘埛淇℃伅-鏍囪瘑 + </summary> + </member> + <member name="P:FlexJobApi.Core.AlipayFundExpandindirectCreateCommand.IdentityType"> + <summary> + 浜岀骇鍟嗘埛淇℃伅-鏍囪瘑绫诲瀷 + </summary> + </member> + <member name="P:FlexJobApi.Core.AlipayFundExpandindirectCreateCommand.Name"> + <summary> + 浜岀骇鍟嗘埛淇℃伅-濮撳悕 + </summary> + </member> + <member name="P:FlexJobApi.Core.AlipayFundExpandindirectCreateCommand.BizType"> + <summary> + 涓氬姟绫诲瀷 + </summary> + </member> + <member name="P:FlexJobApi.Core.AlipayFundExpandindirectCreateCommand.OriginalOrderId"> + <summary> + 鍘熻繘浠跺崟id + </summary> + </member> + <member name="P:FlexJobApi.Core.AlipayFundExpandindirectCreateCommand.SceneCode"> + <summary> + 璧勯噾璁拌处鏈殑涓氬姟鍦烘櫙 + </summary> + </member> + <member name="P:FlexJobApi.Core.AlipayFundExpandindirectCreateCommand.SceneDirections"> + <summary> + 杞处鍦烘櫙璇存槑 + </summary> + </member> + <member name="P:FlexJobApi.Core.AlipayFundExpandindirectCreateCommand.SceneImage"> + <summary> + 杞处鍦烘櫙鎴浘 + </summary> + </member> + <member name="P:FlexJobApi.Core.AlipayFundExpandindirectCreateCommand.SceneQualificationImage"> + <summary> + 鍟嗘埛琛屼笟璧勮川鍥剧墖鎴栧崗璁枃鏈� + </summary> + </member> + <member name="P:FlexJobApi.Core.AlipayFundExpandindirectCreateCommand.SitesInfo"> + <summary> + 鍟嗘埛绔欑偣淇℃伅 + </summary> + </member> + <member name="T:FlexJobApi.Core.AlipayFundExpandindirectCreateCommandResult"> + <summary> + 鏀粯瀹濊祫閲戜簩绾у晢鎴稫YB浠h繘浠� + </summary> + </member> + <member name="P:FlexJobApi.Core.AlipayFundExpandindirectCreateCommandResult.CreateTime"> + <summary> + 杩涗欢鍗曞垱寤烘椂闂� + </summary> + </member> + <member name="P:FlexJobApi.Core.AlipayFundExpandindirectCreateCommandResult.OrderId"> + <summary> + 杩涗欢鍗昳d + </summary> + </member> + <member name="P:FlexJobApi.Core.AlipayFundExpandindirectCreateCommandResult.OutBizNo"> + <summary> + 澶栭儴鍗曞彿 + </summary> + </member> + <member name="P:FlexJobApi.Core.AlipayFundExpandindirectCreateCommandResult.Status"> + <summary> + 杩涗欢鍗曠姸鎬� + </summary> + </member> + <member name="P:FlexJobApi.Core.AlipayFundExpandindirectCreateCommandResult.TaskFinishTime"> + <summary> + 杩涗欢鍗曚换鍔″畬缁撴椂闂� + </summary> + </member> + <member name="T:FlexJobApi.Core.AlipayFundExpandindirectCreateNotifyCommand"> + <summary> + 璧勯噾浜岀骇鍟嗘埛KYB浠h繘浠剁姸鎬侀�氱煡鎺ュ彛 + </summary> + </member> + <member name="P:FlexJobApi.Core.AlipayFundExpandindirectCreateNotifyCommand.notify_id"> + <summary> + 閫氱煡ID + </summary> + </member> + <member name="P:FlexJobApi.Core.AlipayFundExpandindirectCreateNotifyCommand.utc_timestamp"> + <summary> + 娑堟伅鍙戦�佹椂鐨勬湇鍔$鏃堕棿 + </summary> + </member> + <member name="P:FlexJobApi.Core.AlipayFundExpandindirectCreateNotifyCommand.msg_method"> + <summary> + 娑堟伅鎺ュ彛鍚嶇О + </summary> + </member> + <member name="P:FlexJobApi.Core.AlipayFundExpandindirectCreateNotifyCommand.app_id"> + <summary> + 娑堟伅鎺ュ彈鏂圭殑搴旂敤id + </summary> + </member> + <member name="P:FlexJobApi.Core.AlipayFundExpandindirectCreateNotifyCommand.version"> + <summary> + 鐗堟湰鍙�(1.1鐗堟湰涓烘爣鍑嗘秷鎭�) + </summary> + </member> + <member name="P:FlexJobApi.Core.AlipayFundExpandindirectCreateNotifyCommand.biz_content"> + <summary> + 娑堟伅鎶ユ枃 + </summary> + </member> + <member name="P:FlexJobApi.Core.AlipayFundExpandindirectCreateNotifyCommand.sign"> + <summary> + 绛惧悕 + </summary> + </member> + <member name="P:FlexJobApi.Core.AlipayFundExpandindirectCreateNotifyCommand.sign_type"> + <summary> + 绛惧悕绫诲瀷 + </summary> + </member> + <member name="P:FlexJobApi.Core.AlipayFundExpandindirectCreateNotifyCommand.charset"> + <summary> + 缂栫爜闆嗭紝璇ュ瓧绗﹂泦涓洪獙绛惧拰瑙e瘑鎵�闇�瑕佺殑瀛楃闆� + </summary> + </member> + <member name="T:FlexJobApi.Core.AlipayFundExpandindirectImageUploadCommand"> + <summary> + 璧勯噾浜岀骇鍟嗘埛KYB浠h繘浠舵枃浠朵笂浼犳帴鍙� + </summary> + </member> <member name="T:FlexJobApi.Core.AlipayUserAgreementPageSignNotifyQuery"> <summary> 鏀粯瀹濈敤鎴锋巿鏉冨崗璁绾﹂�氱煡 diff --git a/FlexJobApi.Core/Models/UserServer/EnterpriseWallets/Commands/AlipayFundExpandindirectCreateCommand.cs b/FlexJobApi.Core/Models/UserServer/EnterpriseWallets/Commands/AlipayFundExpandindirectCreateCommand.cs new file mode 100644 index 0000000..1f73529 --- /dev/null +++ b/FlexJobApi.Core/Models/UserServer/EnterpriseWallets/Commands/AlipayFundExpandindirectCreateCommand.cs @@ -0,0 +1,110 @@ +锘縰sing MediatR; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Xml.Serialization; + +namespace FlexJobApi.Core +{ + /// <summary> + /// 鏀粯瀹濊祫閲戜簩绾у晢鎴稫YB浠h繘浠� + /// </summary> + [Resource([EnumResourceController.UserServerEnterpriseWallet])] + public class AlipayFundExpandindirectCreateCommand : IRequest<bool> + { + /// <summary> + /// 浜у搧鐮� + /// </summary> + public string ProductCode { get; set; } + /// <summary> + /// 鍦烘櫙鐮� + /// </summary> + public string BizScene { get; set; } + /// <summary> + /// 澶栭儴鍗曞彿 + /// </summary> + public string OutBizNo { get; set; } + /// <summary> + /// 浜岀骇鍟嗘埛淇℃伅-鏍囪瘑 + /// </summary> + public string Identity { get; set; } + /// <summary> + /// 浜岀骇鍟嗘埛淇℃伅-鏍囪瘑绫诲瀷 + /// </summary> + public string IdentityType { get; set; } + /// <summary> + /// 浜岀骇鍟嗘埛淇℃伅-濮撳悕 + /// </summary> + public string Name { get; set; } + /// <summary> + /// 涓氬姟绫诲瀷 + /// </summary> + public string BizType { get; set; } + /// <summary> + /// 鍘熻繘浠跺崟id + /// </summary> + public string OriginalOrderId { get; set; } + /// <summary> + /// 璧勯噾璁拌处鏈殑涓氬姟鍦烘櫙 + /// </summary> + public string SceneCode { get; set; } + /// <summary> + /// 杞处鍦烘櫙璇存槑 + /// </summary> + public string SceneDirections { get; set; } + /// <summary> + /// 杞处鍦烘櫙鎴浘 + /// </summary> + public string SceneImage { get; set; } + /// <summary> + /// 鍟嗘埛琛屼笟璧勮川鍥剧墖鎴栧崗璁枃鏈� + /// </summary> + public string SceneQualificationImage { get; set; } + /// <summary> + /// 鍟嗘埛绔欑偣淇℃伅 + /// </summary> + public AlipayFundExpandindirectCreateCommandSites SitesInfo { get; set; } + } + + public class AlipayFundExpandindirectCreateCommandSites + { + public string WEBSITE { get; set; } + public string APP { get; set; } + public string GONGZH { get; set; } + public string QITA { get; set; } + public string XCHENGXU_ZHI { get; set; } + } + + /// <summary> + /// 鏀粯瀹濊祫閲戜簩绾у晢鎴稫YB浠h繘浠� + /// </summary> + public class AlipayFundExpandindirectCreateCommandResult + { + /// <summary> + /// 杩涗欢鍗曞垱寤烘椂闂� + /// </summary> + public string CreateTime { get; set; } + + /// <summary> + /// 杩涗欢鍗昳d + /// </summary> + public string OrderId { get; set; } + + /// <summary> + /// 澶栭儴鍗曞彿 + /// </summary> + public string OutBizNo { get; set; } + + /// <summary> + /// 杩涗欢鍗曠姸鎬� + /// </summary> + public string Status { get; set; } + + /// <summary> + /// 杩涗欢鍗曚换鍔″畬缁撴椂闂� + /// </summary> + public string TaskFinishTime { get; set; } + } +} diff --git a/FlexJobApi.Core/Models/UserServer/EnterpriseWallets/Commands/AlipayFundExpandindirectCreateNotifyCommand.cs b/FlexJobApi.Core/Models/UserServer/EnterpriseWallets/Commands/AlipayFundExpandindirectCreateNotifyCommand.cs new file mode 100644 index 0000000..08b4467 --- /dev/null +++ b/FlexJobApi.Core/Models/UserServer/EnterpriseWallets/Commands/AlipayFundExpandindirectCreateNotifyCommand.cs @@ -0,0 +1,53 @@ +锘縰sing MediatR; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FlexJobApi.Core +{ + /// <summary> + /// 璧勯噾浜岀骇鍟嗘埛KYB浠h繘浠剁姸鎬侀�氱煡鎺ュ彛 + /// </summary> + [Resource([EnumResourceController.UserServerEnterpriseWallet])] + public class AlipayFundExpandindirectCreateNotifyCommand : IRequest<bool> + { + /// <summary> + /// 閫氱煡ID + /// </summary> + public string notify_id { get; set; } + /// <summary> + /// 娑堟伅鍙戦�佹椂鐨勬湇鍔$鏃堕棿 + /// </summary> + public string utc_timestamp { get; set; } + /// <summary> + /// 娑堟伅鎺ュ彛鍚嶇О + /// </summary> + public string msg_method { get; set; } + /// <summary> + /// 娑堟伅鎺ュ彈鏂圭殑搴旂敤id + /// </summary> + public string app_id { get; set; } + /// <summary> + /// 鐗堟湰鍙�(1.1鐗堟湰涓烘爣鍑嗘秷鎭�) + /// </summary> + public string version { get; set; } + /// <summary> + /// 娑堟伅鎶ユ枃 + /// </summary> + public string biz_content { get; set; } + /// <summary> + /// 绛惧悕 + /// </summary> + public string sign { get; set; } + /// <summary> + /// 绛惧悕绫诲瀷 + /// </summary> + public string sign_type { get; set; } + /// <summary> + /// 缂栫爜闆嗭紝璇ュ瓧绗﹂泦涓洪獙绛惧拰瑙e瘑鎵�闇�瑕佺殑瀛楃闆� + /// </summary> + public string charset { get; set; } + } +} diff --git a/FlexJobApi.Core/Models/UserServer/EnterpriseWallets/Commands/AlipayFundExpandindirectImageUploadCommand.cs b/FlexJobApi.Core/Models/UserServer/EnterpriseWallets/Commands/AlipayFundExpandindirectImageUploadCommand.cs new file mode 100644 index 0000000..c01af33 --- /dev/null +++ b/FlexJobApi.Core/Models/UserServer/EnterpriseWallets/Commands/AlipayFundExpandindirectImageUploadCommand.cs @@ -0,0 +1,15 @@ +锘縰sing System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FlexJobApi.Core +{ + /// <summary> + /// 璧勯噾浜岀骇鍟嗘埛KYB浠h繘浠舵枃浠朵笂浼犳帴鍙� + /// </summary> + public class AlipayFundExpandindirectImageUploadCommand + { + } +} diff --git a/FlexJobApi.Core/Models/UserServer/Users/Queries/GetPersonalLoginInfoQuery.cs b/FlexJobApi.Core/Models/UserServer/Users/Queries/GetPersonalLoginInfoQuery.cs index afd5c97..3090951 100644 --- a/FlexJobApi.Core/Models/UserServer/Users/Queries/GetPersonalLoginInfoQuery.cs +++ b/FlexJobApi.Core/Models/UserServer/Users/Queries/GetPersonalLoginInfoQuery.cs @@ -1,6 +1,7 @@ 锘縰sing MediatR; using System; using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; using System.Linq; using System.Text; using System.Threading.Tasks; @@ -37,6 +38,12 @@ public string Name { get; set; } /// <summary> + /// 鎵嬫満鍙� + /// </summary> + /// <remarks>鑱旂郴鐢佃瘽</remarks> + public string ContactPhoneNumber { get; set; } + + /// <summary> /// 鏄惁瀹炲悕 /// </summary> public bool IsReal { get; set; } diff --git a/FlexJobApi.Core/Utils/AlipayUtils/AlipayUtils.cs b/FlexJobApi.Core/Utils/AlipayUtils/AlipayUtils.cs index 2210f76..6fc5b9d 100644 --- a/FlexJobApi.Core/Utils/AlipayUtils/AlipayUtils.cs +++ b/FlexJobApi.Core/Utils/AlipayUtils/AlipayUtils.cs @@ -67,5 +67,17 @@ Console.WriteLine("璋冪敤澶辫触"); } } + + public AlipayFundExpandindirectCreateResponse FundExpandindirectCreate(AlipayFundExpandindirectCreateModel model, string notifyUrl = null) + { + AlipayFundExpandindirectCreateRequest request = new AlipayFundExpandindirectCreateRequest(); + request.SetBizModel(model); + if (notifyUrl.IsNotNull()) + { + request.SetNotifyUrl(notifyUrl); + } + AlipayFundExpandindirectCreateResponse response = alipayClient.Execute(request); + return response; + } } } diff --git a/FlexJobApi.UserServer.Application/EnterpriseWallets/Commands/AlipayFundExpandindirectCreateCommandHandler.cs b/FlexJobApi.UserServer.Application/EnterpriseWallets/Commands/AlipayFundExpandindirectCreateCommandHandler.cs new file mode 100644 index 0000000..0970ba2 --- /dev/null +++ b/FlexJobApi.UserServer.Application/EnterpriseWallets/Commands/AlipayFundExpandindirectCreateCommandHandler.cs @@ -0,0 +1,37 @@ +锘縰sing Aop.Api.Domain; +using FlexJobApi.Core; +using Mapster; +using MediatR; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FlexJobApi.UserServer.Application +{ + /// <summary> + /// 鏀粯瀹濊祫閲戜簩绾у晢鎴稫YB浠h繘浠� + /// </summary> + public class AlipayFundExpandindirectCreateCommandHandler( + AlipayUtils alipayUtils + ) : + IRequestHandler<AlipayFundExpandindirectCreateCommand, bool> + { + private readonly AlipayUtils alipayUtils = alipayUtils; + + /// <summary> + /// 鏀粯瀹濊祫閲戜簩绾у晢鎴稫YB浠h繘浠� + /// </summary> + /// <param name="request"></param> + /// <param name="cancellationToken"></param> + /// <returns></returns> + public Task<bool> Handle(AlipayFundExpandindirectCreateCommand request, CancellationToken cancellationToken) + { + var model = request.Adapt<AlipayFundExpandindirectCreateModel>(); + model.Sites = request.SitesInfo.ToJson(); + var result = alipayUtils.FundExpandindirectCreate(model); + return Task.FromResult(true); + } + } +} diff --git a/FlexJobApi.UserServer.Application/FlexJobApi.UserServer.Application.csproj b/FlexJobApi.UserServer.Application/FlexJobApi.UserServer.Application.csproj index ed30545..4f446cf 100644 --- a/FlexJobApi.UserServer.Application/FlexJobApi.UserServer.Application.csproj +++ b/FlexJobApi.UserServer.Application/FlexJobApi.UserServer.Application.csproj @@ -15,8 +15,4 @@ <ProjectReference Include="..\FlexJobApi.Core\FlexJobApi.Core.csproj" /> </ItemGroup> - <ItemGroup> - <Folder Include="EnterpriseWallets\Commands\" /> - </ItemGroup> - </Project> diff --git a/FlexJobApi.UserServer.Application/FlexJobApi.UserServer.Application.xml b/FlexJobApi.UserServer.Application/FlexJobApi.UserServer.Application.xml index 1939991..2386160 100644 --- a/FlexJobApi.UserServer.Application/FlexJobApi.UserServer.Application.xml +++ b/FlexJobApi.UserServer.Application/FlexJobApi.UserServer.Application.xml @@ -564,6 +564,24 @@ <param name="cancellationToken"></param> <returns></returns> </member> + <member name="T:FlexJobApi.UserServer.Application.AlipayFundExpandindirectCreateCommandHandler"> + <summary> + 鏀粯瀹濊祫閲戜簩绾у晢鎴稫YB浠h繘浠� + </summary> + </member> + <member name="M:FlexJobApi.UserServer.Application.AlipayFundExpandindirectCreateCommandHandler.#ctor(FlexJobApi.Core.AlipayUtils)"> + <summary> + 鏀粯瀹濊祫閲戜簩绾у晢鎴稫YB浠h繘浠� + </summary> + </member> + <member name="M:FlexJobApi.UserServer.Application.AlipayFundExpandindirectCreateCommandHandler.Handle(FlexJobApi.Core.AlipayFundExpandindirectCreateCommand,System.Threading.CancellationToken)"> + <summary> + 鏀粯瀹濊祫閲戜簩绾у晢鎴稫YB浠h繘浠� + </summary> + <param name="request"></param> + <param name="cancellationToken"></param> + <returns></returns> + </member> <member name="T:FlexJobApi.UserServer.Application.AlipayUserAgreementPageSignNotifyQueryHandler"> <summary> 鏀粯瀹濈敤鎴锋巿鏉冨崗璁绾﹂�氱煡 diff --git a/FlexJobApi.Web.Entry/appsettings.json b/FlexJobApi.Web.Entry/appsettings.json index ac166a8..e55df62 100644 --- a/FlexJobApi.Web.Entry/appsettings.json +++ b/FlexJobApi.Web.Entry/appsettings.json @@ -76,8 +76,8 @@ }, "SMS": { "Enable": true, - "AccessKeyId": "LTAI5tMS7qz1duiyncCqxB8H", - "AccessSecret": "TEHSXK6f6Njg0v0MSFkrjURofdjuKQ", + "AccessKeyId": "LTAI5tLzz2jnXrUAAiC2kduH", + "AccessSecret": "do1XqrgHJ5gOuFHhO5eku0FyYzZvbQ", "Version": "2017-05-25", "SignName": "818鏁板瓧浜哄姏璧勪骇骞冲彴", "RegionId": "cn-hangzhou", -- Gitblit v1.9.1