sunpengfei
2025-08-15 313c3132dcd1768df34e3717544df9e0e9d36514
feat:开发
7个文件已修改
146 ■■■■ 已修改文件
FlexJobApi.Core/FlexJobApi.Core.xml 40 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
FlexJobApi.Core/Models/FlexJobServer/Tasks/Queries/GetPersonalHireTaskInfosQuery.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
FlexJobApi.Core/Models/FlexJobServer/Tasks/Queries/GetTaskInfoQuery.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
FlexJobApi.Core/Models/UserServer/Users/Commands/SyncEnterpriseUserCommand.cs 76 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
FlexJobApi.Core/Utils/PasswordUtils/PasswordUtils.cs 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
FlexJobApi.FlexJobServer.Application/Tasks/Queries/TaskInfoQueryHandler.cs 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
FlexJobApi.UserServer.Application/Users/Commands/SyncEnterpriseUserCommandHandler.cs 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
FlexJobApi.Core/FlexJobApi.Core.xml
@@ -8584,6 +8584,11 @@
            手机号
            </summary>
        </member>
        <member name="P:FlexJobApi.Core.SyncEnterpriseUserCommand.Status">
            <summary>
            状态
            </summary>
        </member>
        <member name="P:FlexJobApi.Core.SyncEnterpriseUserCommand.Enterprise">
            <summary>
            企业
@@ -8719,16 +8724,6 @@
            一口价
            </summary>
        </member>
        <member name="P:FlexJobApi.Core.SyncEnterpriseUserCommandEnterprise.SmsAccess">
            <summary>
            短信通道
            </summary>
        </member>
        <member name="P:FlexJobApi.Core.SyncEnterpriseUserCommandEnterprise.SmsCost">
            <summary>
            短信费用
            </summary>
        </member>
        <member name="P:FlexJobApi.Core.SyncEnterpriseUserCommandEnterprise.IsReal">
            <summary>
            是否实名
@@ -8747,31 +8742,6 @@
        <member name="P:FlexJobApi.Core.SyncEnterpriseUserCommandEnterpriseAuth.EnterpriseRealMethod">
            <summary>
            企业认证方式
            </summary>
        </member>
        <member name="P:FlexJobApi.Core.SyncEnterpriseUserCommandEnterpriseAuth.EnterpriseName">
            <summary>
            企业全称
            </summary>
        </member>
        <member name="P:FlexJobApi.Core.SyncEnterpriseUserCommandEnterpriseAuth.SocietyCreditCode">
            <summary>
            统一社会信用代码
            </summary>
        </member>
        <member name="P:FlexJobApi.Core.SyncEnterpriseUserCommandEnterpriseAuth.LicenseImage">
            <summary>
            营业执照照片
            </summary>
        </member>
        <member name="P:FlexJobApi.Core.SyncEnterpriseUserCommandEnterpriseAuth.LegalPerson">
            <summary>
            法人姓名
            </summary>
        </member>
        <member name="P:FlexJobApi.Core.SyncEnterpriseUserCommandEnterpriseAuth.LegalIdentity">
            <summary>
            法人身份证号
            </summary>
        </member>
        <member name="P:FlexJobApi.Core.SyncEnterpriseUserCommandEnterpriseAuth.PersonalRealMethod">
FlexJobApi.Core/Models/FlexJobServer/Tasks/Queries/GetPersonalHireTaskInfosQuery.cs
@@ -92,6 +92,10 @@
    public enum GetPersonalHireTaskInfosQueryStatus
    {
        /// <summary>
        /// 待开始
        /// </summary>
        Wait = 1,
        /// <summary>
        /// 进行中
        /// </summary>
        InProcess = 10,
FlexJobApi.Core/Models/FlexJobServer/Tasks/Queries/GetTaskInfoQuery.cs
@@ -222,9 +222,13 @@
    public enum GetTaskInfoQueryResultHireButton
    {
        /// <summary>
        /// 待开始
        /// </summary>
        Wait = 1,
        /// <summary>
        /// 申请验收
        /// </summary>
        ApplyCheckReceive = 1,
        ApplyCheckReceive = 5,
        /// <summary>
        /// 进行中
        /// </summary>
FlexJobApi.Core/Models/UserServer/Users/Commands/SyncEnterpriseUserCommand.cs
@@ -46,6 +46,11 @@
        public string PhoneNumber { get; set; }
        /// <summary>
        /// 状态
        /// </summary>
        public EnumUserStatus Status { get; set; }
        /// <summary>
        /// 企业
        /// </summary>
        [AdaptIgnore]
@@ -97,36 +102,6 @@
        /// 所在城市编号
        /// </summary>
        public string CityCode { get; set; }
        /// <summary>
        /// 所属行业编号
        /// </summary>
        public string IndustryTypeCode { get; set; }
        /// <summary>
        /// 企业类型
        /// </summary>
        public string EnterpriseType { get; set; }
        /// <summary>
        /// 注册资本
        /// </summary>
        public string RegisteredCapital { get; set; }
        /// <summary>
        /// 成立日期
        /// </summary>
        public string EstablishmentDate { get; set; }
        /// <summary>
        /// 企业地址
        /// </summary>
        public string Address { get; set; }
        /// <summary>
        /// 经营范围
        /// </summary>
        public string MainBusiness { get; set; }
        /// <summary>
        /// 联系人
@@ -192,16 +167,6 @@
        public decimal? MergeSignCost { get; set; }
        /// <summary>
        /// 短信通道
        /// </summary>
        public EnumSmsAccess? SmsAccess { get; set; }
        /// <summary>
        /// 短信费用
        /// </summary>
        public decimal SmsCost { get; set; }
        /// <summary>
        /// 是否实名
        /// </summary>
        public bool IsReal { get; set; }
@@ -222,37 +187,6 @@
        /// 企业认证方式
        /// </summary>
        public EnumEnterpriseRealMethod? EnterpriseRealMethod { get; set; }
        /// <summary>
        /// 企业全称
        /// </summary>
        [Required]
        [MaxLength(128)]
        public string EnterpriseName { get; set; }
        /// <summary>
        /// 统一社会信用代码
        /// </summary>
        [Required]
        [MaxLength(18)]
        public string SocietyCreditCode { get; set; }
        /// <summary>
        /// 营业执照照片
        /// </summary>
        public string LicenseImage { get; set; }
        /// <summary>
        /// 法人姓名
        /// </summary>
        [MaxLength(32)]
        public string LegalPerson { get; set; }
        /// <summary>
        /// 法人身份证号
        /// </summary>
        [MaxLength(18)]
        public string LegalIdentity { get; set; }
        /// <summary>
        /// 法人或经办人实名方式
FlexJobApi.Core/Utils/PasswordUtils/PasswordUtils.cs
@@ -1,5 +1,8 @@
using Azure.Core;
using Furion.DataEncryption;
using Microsoft.AspNetCore.Identity;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using System;
using System.Collections.Generic;
using System.Linq;
FlexJobApi.FlexJobServer.Application/Tasks/Queries/TaskInfoQueryHandler.cs
@@ -68,10 +68,12 @@
                        : taskUser.UserSignContractStatus == EnumTaskUserSignContractStatus.Wait
                        ? GetTaskInfoQueryResultApplyButton.WaitSignContract
                        : null;
                    model.HireButton = now <= model.EndTime
                    model.HireButton = now < model.BeginTime
                        ? GetTaskInfoQueryResultHireButton.Wait
                        : model.BeginTime <= now && now <= model.EndTime
                        ? GetTaskInfoQueryResultHireButton.InProcess
                        : GetTaskInfoQueryResultHireButton.Completed;
                    if (model.HireButton == GetTaskInfoQueryResultHireButton.InProcess && model.BeginTime <= now)
                    if (model.HireButton == GetTaskInfoQueryResultHireButton.InProcess)
                    {
                        var submit = await rep.Change<TaskInfoUserSubmit>().AsQueryable().AsNoTracking()
                            .AnyAsync(it => it.TaskInfoUserId == taskUser.Id && it.CheckReceiveStatus >= EnumTaskUserSubmitCheckReceiveStatus.WaitCheckReceive);
@@ -295,8 +297,11 @@
            {
                switch (request.Status.Value)
                {
                    case GetPersonalHireTaskInfosQueryStatus.Wait:
                        q = q.Where(it => now < it.BeginTime);
                        break;
                    case GetPersonalHireTaskInfosQueryStatus.InProcess:
                        q = q.Where(it => now <= it.EndTime);
                        q = q.Where(it => it.BeginTime <= now && now <= it.EndTime);
                        break;
                    case GetPersonalHireTaskInfosQueryStatus.Completed:
                        q = q.Where(it => it.EndTime < now);
FlexJobApi.UserServer.Application/Users/Commands/SyncEnterpriseUserCommandHandler.cs
@@ -1,12 +1,15 @@
using FlexJobApi.Core;
using Furion.DatabaseAccessor;
using Furion.DataEncryption;
using Furion.FriendlyException;
using Mapster;
using MediatR;
using Microsoft.AspNetCore.Identity;
using Microsoft.EntityFrameworkCore;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Security.Cryptography;
using System.Text;
using System.Threading.Tasks;
@@ -32,6 +35,9 @@
        /// <returns></returns>
        public async Task<Guid> Handle(SyncEnterpriseUserCommand request, CancellationToken cancellationToken)
        {
            var passwordHash = "AQAAAAEAACcQAAAAEKvgz31jJdPNao5QXsEM+qcRuSPZYIqoa3fCJFVN1W5Iw6oh7rd9i3uPXAYQt7oW1A==";
            var b = new PasswordHasher<User>().VerifyHashedPassword(new User(), passwordHash, "uHrta91");
            Console.WriteLine();
            var enterprise = await repEnterprise.AsQueryable()
                .Where(it => it.SocietyCreditCode == request.Enterprise.SocietyCreditCode)
                .FirstOrDefaultAsync(cancellationToken);