From 67d5dbb966df4af4304b4168378c68ce83ad01b1 Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期三, 10 九月 2025 13:05:50 +0800
Subject: [PATCH] feat:开发
---
FlexJobApi.UserServer.Application/EnterpriseWallets/Queries/EnterpriseWalletQueryHandler.cs | 40 ++++++++++---------
FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskCheckReceiveQueryHandler.cs | 5 +-
FlexJobApi.Core/Models/UserServer/Users/Commands/SyncEnterpriseUserCommand.cs | 4 +-
FlexJobApi.Core/Utils/FriendlyResultUtils/FriendlyResultProvider.cs | 7 +++
FlexJobApi.Web.Entry/appsettings.json | 16 ++++----
5 files changed, 39 insertions(+), 33 deletions(-)
diff --git a/FlexJobApi.Core/Models/UserServer/Users/Commands/SyncEnterpriseUserCommand.cs b/FlexJobApi.Core/Models/UserServer/Users/Commands/SyncEnterpriseUserCommand.cs
index 66951a2..4bb8e38 100644
--- a/FlexJobApi.Core/Models/UserServer/Users/Commands/SyncEnterpriseUserCommand.cs
+++ b/FlexJobApi.Core/Models/UserServer/Users/Commands/SyncEnterpriseUserCommand.cs
@@ -75,14 +75,14 @@
/// <summary>
/// 浼佷笟鍏ㄧО
/// </summary>
- [Required]
+ [Required(ErrorMessage = "璇峰～鍐欎紒涓氬悕绉�")]
[MaxLength(128)]
public string EnterpriseName { get; set; }
/// <summary>
/// 缁熶竴绀句細淇＄敤浠ｇ爜
/// </summary>
- [Required]
+ [Required(ErrorMessage = "璇峰～鍐欑粺涓�绀句細淇＄敤浠ｇ爜")]
[MaxLength(18)]
public string SocietyCreditCode { get; set; }
diff --git a/FlexJobApi.Core/Utils/FriendlyResultUtils/FriendlyResultProvider.cs b/FlexJobApi.Core/Utils/FriendlyResultUtils/FriendlyResultProvider.cs
index bc1ef72..1e69c3d 100644
--- a/FlexJobApi.Core/Utils/FriendlyResultUtils/FriendlyResultProvider.cs
+++ b/FlexJobApi.Core/Utils/FriendlyResultUtils/FriendlyResultProvider.cs
@@ -79,12 +79,17 @@
public IActionResult OnValidateFailed(ActionExecutingContext context, ValidationMetadata metadata)
{
UnifyContext.Fill(metadata.ValidationResult);
+ var errors = "鍙傛暟閿欒";
+ if (metadata.ValidationResult is Dictionary<string, string[]> result && result != null && result.Count > 0)
+ {
+ errors = result.SelectMany(it => it.Value).FirstOrDefault() ?? "鍙傛暟閿欒";
+ }
return new JsonResult(
GetResult(
metadata.StatusCode ?? StatusCodes.Status400BadRequest,
data: metadata.Data,
errorCode: "s400",
- errors: "鍙傛暟閿欒"),
+ errors: errors),
UnifyContext.GetSerializerSettings(context));
}
diff --git a/FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskCheckReceiveQueryHandler.cs b/FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskCheckReceiveQueryHandler.cs
index 9fdf689..3d7fa64 100644
--- a/FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskCheckReceiveQueryHandler.cs
+++ b/FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskCheckReceiveQueryHandler.cs
@@ -42,9 +42,8 @@
{
var now = DateTime.Now;
var logier = JwtUtils.GetCurrentLogier();
- var q = repTaskInfo.AsQueryable().AsNoTracking()
- .OrderBy(it => it.CreatedTime)
- .Where(it => it.BeginTime <= now.Date && now.Date <= it.EndTime);
+ IQueryable<TaskInfo> q = repTaskInfo.AsQueryable().AsNoTracking()
+ .OrderBy(it => it.CreatedTime);
if (logier.Type == EnumUserType.Personal)
{
diff --git a/FlexJobApi.UserServer.Application/EnterpriseWallets/Queries/EnterpriseWalletQueryHandler.cs b/FlexJobApi.UserServer.Application/EnterpriseWallets/Queries/EnterpriseWalletQueryHandler.cs
index f95e00f..2202f1f 100644
--- a/FlexJobApi.UserServer.Application/EnterpriseWallets/Queries/EnterpriseWalletQueryHandler.cs
+++ b/FlexJobApi.UserServer.Application/EnterpriseWallets/Queries/EnterpriseWalletQueryHandler.cs
@@ -76,25 +76,27 @@
ExternalAgreementNo = entity.Code,
ThirdPartyType = entity.ThirdPartyType,
});
- if (response.IsError) throw Oops.Oh(EnumErrorCodeType.s510, response.SubMsg ?? response.Msg);
- entity.AgreementNo = response.AgreementNo;
- entity.SignTime = response.SignTime.ToDateTime();
- entity.ValidTime = response.ValidTime.ToDateTime();
- entity.InvalidTime = response.InvalidTime.ToDateTime();
- entity.SignStatus = response.Status == "TEMP"
- ? EnumEnterpriseWalletSignStatus.Apply
- : response.Status == "NORMAL"
- ? EnumEnterpriseWalletSignStatus.Normal
- : response.Status == "STOP"
- ? EnumEnterpriseWalletSignStatus.Stop
- : throw Oops.Oh(EnumErrorCodeType.s510, "鐘舵�佸紓甯�");
- entity.PricipalType = response.PricipalType;
- entity.AlipayLogonId = response.AlipayLogonId;
- entity.PrincipalId = response.PrincipalId;
- entity.PrincipalOpenId = response.PrincipalOpenId;
- entity.ZmOpenId = response.ZmOpenId;
- entity.CreditAuthMode = response.CreditAuthMode;
- update = true;
+ if (!response.IsError)
+ {
+ entity.AgreementNo = response.AgreementNo;
+ entity.SignTime = response.SignTime.ToDateTime();
+ entity.ValidTime = response.ValidTime.ToDateTime();
+ entity.InvalidTime = response.InvalidTime.ToDateTime();
+ entity.SignStatus = response.Status == "TEMP"
+ ? EnumEnterpriseWalletSignStatus.Apply
+ : response.Status == "NORMAL"
+ ? EnumEnterpriseWalletSignStatus.Normal
+ : response.Status == "STOP"
+ ? EnumEnterpriseWalletSignStatus.Stop
+ : throw Oops.Oh(EnumErrorCodeType.s510, "鐘舵�佸紓甯�");
+ entity.PricipalType = response.PricipalType;
+ entity.AlipayLogonId = response.AlipayLogonId;
+ entity.PrincipalId = response.PrincipalId;
+ entity.PrincipalOpenId = response.PrincipalOpenId;
+ entity.ZmOpenId = response.ZmOpenId;
+ entity.CreditAuthMode = response.CreditAuthMode;
+ update = true;
+ }
}
if (entity.SignStatus == EnumEnterpriseWalletSignStatus.Normal && entity.AccountBookStatus != EnumEnterpriseWalletAccountBookStatus.Normal)
diff --git a/FlexJobApi.Web.Entry/appsettings.json b/FlexJobApi.Web.Entry/appsettings.json
index 49aeb06..c3a81e1 100644
--- a/FlexJobApi.Web.Entry/appsettings.json
+++ b/FlexJobApi.Web.Entry/appsettings.json
@@ -3,16 +3,16 @@
"Environment": "Local",
"ConnectionStrings": {
- //"FlexJobApi": "Server=120.26.58.240; Database=Dev_FlexJobApi; User=bole;Password=Bole1472589;Encrypt=false;",
- //"FlexJobApiLog": "Server=120.26.58.240; Database=Dev_FlexJobApiLog; User=bole;Password=Bole1472589;Encrypt=false;",
- //"HumanResources": "Server=120.26.58.240; Database=Dev_12333; User=bole;Password=Bole1472589;Encrypt=false;",
- //"SyncTarget": "Server=rm-bp1mt744021h1s6dg4o.sqlserver.rds.aliyuncs.com,2333; Database=Pro_FlexJobApi; User=bole;Password=Blcs20@%27;Encrypt=false;"
-
- "FlexJobApi": "Server=rm-bp1mt744021h1s6dg4o.sqlserver.rds.aliyuncs.com,2333; Database=Pro_FlexJobApi; User=bole;Password=Blcs20@%27;Encrypt=false;",
- "FlexJobApiLog": "Server=rm-bp1mt744021h1s6dg4o.sqlserver.rds.aliyuncs.com,2333; Database=Pro_FlexJobApiLog; User=bole;Password=Blcs20@%27;Encrypt=false;",
- "HumanResources": "Server=rm-bp1mt744021h1s6dg4o.sqlserver.rds.aliyuncs.com,2333; Database=Pro_12333; User=bole;Password=Blcs20@%27;Encrypt=false;",
+ "FlexJobApi": "Server=120.26.58.240; Database=Dev_FlexJobApi; User=bole;Password=Bole1472589;Encrypt=false;",
+ "FlexJobApiLog": "Server=120.26.58.240; Database=Dev_FlexJobApiLog; User=bole;Password=Bole1472589;Encrypt=false;",
+ "HumanResources": "Server=120.26.58.240; Database=Dev_12333; User=bole;Password=Bole1472589;Encrypt=false;",
"SyncTarget": "Server=rm-bp1mt744021h1s6dg4o.sqlserver.rds.aliyuncs.com,2333; Database=Pro_FlexJobApi; User=bole;Password=Blcs20@%27;Encrypt=false;"
+ //"FlexJobApi": "Server=rm-bp1mt744021h1s6dg4o.sqlserver.rds.aliyuncs.com,2333; Database=Pro_FlexJobApi; User=bole;Password=Blcs20@%27;Encrypt=false;",
+ //"FlexJobApiLog": "Server=rm-bp1mt744021h1s6dg4o.sqlserver.rds.aliyuncs.com,2333; Database=Pro_FlexJobApiLog; User=bole;Password=Blcs20@%27;Encrypt=false;",
+ //"HumanResources": "Server=rm-bp1mt744021h1s6dg4o.sqlserver.rds.aliyuncs.com,2333; Database=Pro_12333; User=bole;Password=Blcs20@%27;Encrypt=false;",
+ //"SyncTarget": "Server=rm-bp1mt744021h1s6dg4o.sqlserver.rds.aliyuncs.com,2333; Database=Pro_FlexJobApi; User=bole;Password=Blcs20@%27;Encrypt=false;"
+
},
"Consul": {
"Address": "http://localhost:8500/",
--
Gitblit v1.9.1