feat:开发

sunpengfei

6 天以前 28db30e5a458ee012959269d50e16eadaa0c5d12

feat:开发

 FlexJobApi.Core/Entities/UserServer/Enterprises/EnterpriseWalletTransaction.cs

@@ -52,6 +52,16 @@
        public decimal Balance { get; set; }

        /// <summary>
        /// 收款人姓名
        /// </summary>
        public string ReceiveName { get; set; }

        /// <summary>
        /// 收款账户
        /// </summary>
        public string ReceiveAccount { get; set; }

        /// <summary>
        /// 备注
        /// </summary>
        public string Remark { get; set; }

 FlexJobApi.Core/Jobs/CompleteTaskSettlementT1Job.cs

@@ -91,6 +91,8 @@
                            order.BizScene = "ENTRUST_TRANSFER";
                            order.TransactionStatus = EnumEnterpriseWalletTransactionStatus.WaitSubmit;
                            order.Balance = wallet.Balance;
                            order.ReceiveName = user.ReceiveName;
                            order.ReceiveAccount = user.ReceiveAccount;
                            await SetCode(order);
                            await repEnterpriseWalletTransaction.InsertNowAsync(order);

@@ -103,8 +105,8 @@
                                PayeeInfo = new Participant
                                {
                                    IdentityType = "ALIPAY_LOGON_ID",
                                    Identity = user.ReceiveAccount,
                                    Name = user.ReceiveName,
                                    Identity = order.ReceiveAccount,
                                    Name = order.ReceiveName,
                                },
                                PayerInfo = new Participant
                                {

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

@@ -158,7 +158,7 @@
        public async Task<Guid> Handle(SureTaskSettlementOrderCommand request, CancellationToken cancellationToken)
        {
            var entity = await TaskInfoRepository.GetQueryable(rep, false)
                .Include(it => it.TaskInfoUsers)
                .Include(it => it.TaskInfoUsers).ThenInclude(it => it.EnterpriseEmployee)
                .Where(it => it.Id == request.TaskInfoId)
                .FirstOrDefaultAsync();
            if (entity == null) throw Oops.Oh(EnumErrorCodeType.s404, "任务");
@@ -183,6 +183,7 @@
                if (model.ActualSettlementAmount > 0 && model.ActualSettlementAmount < (decimal)0.3) throw Oops.Oh(EnumErrorCodeType.s510, $"{model.Name}实发金额不可小于1元");
                user.Bank = model.Bank;
                user.BankBranch = model.BankBranch;
                user.ReceiveName = user.EnterpriseEmployee.Name;
                user.ReceiveAccount = model.ReceiveAccount;
                user.SettlementAmount = model.SettlementAmount;
                user.ActualSettlementAmount = model.ActualSettlementAmount;