feat:开发

sunpengfei

12 小时以前 19863208cfdaf01735e75fbdafa33e426e735c04

feat:开发

 FlexJobApi.Core/FlexJobApi.Core.xml

@@ -4014,9 +4014,19 @@
            手机号
            </summary>
        </member>
        <member name="F:FlexJobApi.Core.EnumValidationTypes.ValiIdentity">
        <member name="F:FlexJobApi.Core.EnumValidationTypes.ValidIdentity">
            <summary>
            身份证号
            </summary>
        </member>
        <member name="F:FlexJobApi.Core.EnumValidationTypes.ValidRealName">
            <summary>
            姓名
            </summary>
        </member>
        <member name="F:FlexJobApi.Core.EnumValidationTypes.ValidVerifyCode">
            <summary>
            验证码
            </summary>
        </member>
        <member name="T:FlexJobApi.Core.EnumBillingMethod">
@@ -10397,6 +10407,26 @@
            企业签约状态
            </summary>
        </member>
        <member name="P:FlexJobApi.Core.GetEnterpriseEmployeesQuery.SignContractStatus">
            <summary>
            签约状态
            </summary>
        </member>
        <member name="F:FlexJobApi.Core.EnumGetEnterpriseEmployeesQuerySignContractStatus.UserWait">
            <summary>
            灵工待签约
            </summary>
        </member>
        <member name="F:FlexJobApi.Core.EnumGetEnterpriseEmployeesQuerySignContractStatus.EnterpriseWait">
            <summary>
            企业待签约
            </summary>
        </member>
        <member name="F:FlexJobApi.Core.EnumGetEnterpriseEmployeesQuerySignContractStatus.Pass">
            <summary>
            已签约
            </summary>
        </member>
        <member name="T:FlexJobApi.Core.GetEnterpriseEmployeesQueryResult">
            <summary>
            查询灵工分页列表数据-结果

 FlexJobApi.Core/Jobs/CompleteTaskSettlementT1Job.cs

@@ -307,6 +307,10 @@
                    AccountBookId = wallet.AccountBookId,
                    SceneCode = "SATF_FUND_BOOK",
                    MerchantUserId = wallet.Code,
                    ExtInfo = new
                    {
                        agreement_no = wallet.AgreementNo
                    }.ToJson()
                });
                if (response.IsError) throw Oops.Oh(EnumErrorCodeType.s510, response.SubMsg ?? response.Msg);
                wallet.Balance = response.AvailableAmount.ToDecimal() ?? 0;

 FlexJobApi.Core/Jobs/RefreshEnterpriseWalletStatusJob.cs

@@ -104,6 +104,10 @@
                                AccountBookId = entity.AccountBookId,
                                SceneCode = "SATF_FUND_BOOK",
                                MerchantUserId = entity.Code,
                                ExtInfo = new
                                {
                                    agreement_no = entity.AgreementNo
                                }.ToJson()
                            });
                            if (response.IsError) throw Oops.Oh(EnumErrorCodeType.s510, response.SubMsg ?? response.Msg);
                            entity.Balance = response.AvailableAmount.ToDecimal() ?? 0;

 FlexJobApi.Core/Jobs/RefreshEnterpriseWalletTransactionStatusJob.cs

@@ -153,6 +153,10 @@
                                AccountBookId = wallet.AccountBookId,
                                SceneCode = "SATF_FUND_BOOK",
                                MerchantUserId = wallet.Code,
                                ExtInfo = new
                                {
                                    agreement_no = wallet.AgreementNo
                                }.ToJson()
                            });
                            if (response.IsError) throw Oops.Oh(EnumErrorCodeType.s510, response.SubMsg ?? response.Msg);
                            wallet.Balance = response.AvailableAmount.ToDecimal() ?? 0;

 FlexJobApi.FlexJobServer.Application/TaskUsers/Queries/TaskUserQueryHandler.cs

@@ -255,10 +255,10 @@
                    {
                        errors.Add("灵工不存在");
                    }
                    else if (item.CheckReceiveStatus != EnumTaskCheckReceiveStatus.Completed)
                    {
                        errors.Add("未完成验收");
                    }
                    //else if (item.CheckReceiveStatus != EnumTaskCheckReceiveStatus.Completed)
                    //{
                    //    errors.Add("未完成验收");
                    //}
                    else if (item.Name != model.Name)
                    {
                        errors.Add("灵工姓名与实名信息不一致");

 FlexJobApi.FlexJobServer.Application/Tasks/Commands/TaskInfoCommandHandler.cs

@@ -178,7 +178,7 @@
                if (user == null) throw Oops.Oh(EnumErrorCodeType.s404, $"灵工{model.Name}");
                if (user.SettlementStatus == EnumTaskSettlementStatus.InProcess) throw Oops.Oh(EnumErrorCodeType.s510, $"{model.Name}结算中不可修改，请先撤回");
                if (user.SettlementStatus == EnumTaskSettlementStatus.Completed) throw Oops.Oh(EnumErrorCodeType.s510, $"{model.Name}已结算不可修改");
                if (user.CheckReceiveStatus != EnumTaskCheckReceiveStatus.Completed) throw Oops.Oh(EnumErrorCodeType.s510, $"{model.Name}未验收");
                //if (user.CheckReceiveStatus != EnumTaskCheckReceiveStatus.Completed) throw Oops.Oh(EnumErrorCodeType.s510, $"{model.Name}未验收");
                if (model.SettlementAmount < 0) throw Oops.Oh(EnumErrorCodeType.s510, $"{model.Name}结算金额不可负数");
                if (model.ActualSettlementAmount < 0) throw Oops.Oh(EnumErrorCodeType.s510, $"{model.Name}实发金额不可负数");
                if (model.ActualSettlementAmount > 0 && model.ActualSettlementAmount < 1) throw Oops.Oh(EnumErrorCodeType.s510, $"{model.Name}实发金额不可小于1元");
@@ -269,6 +269,10 @@
                AccountBookId = wallet.AccountBookId,
                SceneCode = "SATF_FUND_BOOK",
                MerchantUserId = wallet.Code,
                ExtInfo = new
                {
                    agreement_no = wallet.AgreementNo
                }.ToJson()
            });
            if (response.IsError) throw Oops.Oh(EnumErrorCodeType.s510, response.SubMsg ?? response.Msg);
            wallet.Balance = response.AvailableAmount.ToDecimal() ?? 0;

 FlexJobApi.UserServer.Application/EnterpriseWallets/Commands/EnterpriseWalletCommandHandler.cs

@@ -192,6 +192,10 @@
                AccountBookId = entity.AccountBookId,
                SceneCode = "SATF_FUND_BOOK",
                MerchantUserId = entity.Code,
                ExtInfo = new
                {
                    agreement_no = entity.AgreementNo
                }.ToJson()
            });
            if (response.IsError) throw Oops.Oh(EnumErrorCodeType.s510, response.SubMsg ?? response.Msg);
            entity.Balance = response.AvailableAmount.ToDecimal() ?? 0;

 FlexJobApi.UserServer.Application/EnterpriseWallets/Queries/EnterpriseWalletQueryHandler.cs

@@ -154,18 +154,6 @@
                    }
                }

                if (entity.AccountBookStatus == EnumEnterpriseWalletAccountBookStatus.Normal)
                {
                    var response = alipayUtils.FundAccountbookQuery(new AlipayFundAccountbookQueryModel
                    {
                        AccountBookId = entity.AccountBookId,
                        SceneCode = "SATF_FUND_BOOK",
                        MerchantUserId = entity.Code,
                    });
                    if (response.IsError) throw Oops.Oh(EnumErrorCodeType.s510, response.SubMsg ?? response.Msg);
                    entity.Balance = response.AvailableAmount.ToDecimal() ?? 0;
                    update = true;
                }
            }

            if (update)
@@ -217,6 +205,23 @@
            else
            {
                model.ExpandindirectOrderStatus = EnumEnterpriseWalletExpandindirectOrderStatus.Wait;
            }

            if (entity.AccountBookStatus == EnumEnterpriseWalletAccountBookStatus.Normal)
            {
                var response = alipayUtils.FundAccountbookQuery(new AlipayFundAccountbookQueryModel
                {
                    AccountBookId = entity.AccountBookId,
                    SceneCode = "SATF_FUND_BOOK",
                    MerchantUserId = entity.Code,
                    ExtInfo = new
                    {
                        agreement_no = entity.AgreementNo
                    }.ToJson()
                });
                if (response.IsError) throw Oops.Oh(EnumErrorCodeType.s510, response.SubMsg ?? response.Msg);
                entity.Balance = response.AvailableAmount.ToDecimal() ?? 0;
                await rep.UpdateNowAsync(entity);
            }

            return model;
@@ -296,6 +301,10 @@
                AccountBookId = entity.AccountBookId,
                SceneCode = "SATF_FUND_BOOK",
                MerchantUserId = entity.Code,
                ExtInfo = new
                {
                    agreement_no = entity.AgreementNo
                }.ToJson()
            });
            if (response.IsError) throw Oops.Oh(EnumErrorCodeType.s510, response.SubMsg ?? response.Msg);
            entity.Balance = response.AvailableAmount.ToDecimal() ?? 0;