From ca6b1e43b46324066d20a38a0a767634a534c1c3 Mon Sep 17 00:00:00 2001 From: zhengyiming <540361168@qq.com> Date: 星期一, 09 六月 2025 09:24:10 +0800 Subject: [PATCH] Merge branch 'dev-1.3' of http://120.26.58.240:8888/r/LifePaymentApi into dev-1.3 --- LifePayment/LifePayment.Application/LifePay/LifePayService.cs | 109 ++++++++++++++++++++++++++++++++++-------------------- 1 files changed, 68 insertions(+), 41 deletions(-) diff --git a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs index a5a560b..dbbcb41 100644 --- a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs +++ b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs @@ -1,4 +1,5 @@ -锘縰sing LifePayment.Application.Contracts; +锘縰sing Alipay.EasySDK.Payment.Common.Models; +using LifePayment.Application.Contracts; using LifePayment.Domain; using LifePayment.Domain.LifePay; using LifePayment.Domain.Models; @@ -9,6 +10,7 @@ using Newtonsoft.Json; using System; using System.Collections.Generic; +using System.Data; using System.Linq; using System.Linq.Dynamic.Core; using System.Threading.Tasks; @@ -19,18 +21,7 @@ using Volo.Abp.EventBus.Distributed; using Z.EntityFramework.Plus; using ZeroD.Util; -using Alipay.EasySDK.Payment.Common.Models; using static LifePayment.Domain.Shared.LifePaymentConstant; -using ZeroD.Util.Fadd; -using Nest; -using Volo.Abp.Domain.Entities; -using Volo.Abp.ObjectMapping; -using NPOI.SS.Formula.Functions; -using StackExchange.Redis; -using static Volo.Abp.Identity.Settings.IdentitySettingNames; -using static Microsoft.EntityFrameworkCore.DbLoggerCategory; -using LifePayment.Application.LifePay; -using Alipay.AopSdk.Core.Domain; namespace LifePayment.Application; @@ -59,10 +50,12 @@ private readonly InitSetting _initSettingOptions; private readonly IACOOLYManager _aCOOLYManager; + private readonly IRepository<LifePayPromoter, Guid> lifePayPromoterRepository; public LifePayService(IDistributedEventBus distributedEventBus, ILogger<LifePayService> logger, IACOOLYManager aCOOLYManager, + IRepository<LifePayPromoter, Guid> lifePayPromoterRepository, IRepository<LifePayRate, Guid> lifePayRateRepository, IRepository<LifePayOrder, Guid> lifePayOrderRepository, IRepository<LifePayUser, Guid> lifePayUserRepository, @@ -83,6 +76,7 @@ { _logger = logger; _aCOOLYManager = aCOOLYManager; + this.lifePayPromoterRepository = lifePayPromoterRepository; _lifePayRateRepository = lifePayRateRepository; _lifePayOrderRepository = lifePayOrderRepository; _lifePayUserRepository = lifePayUserRepository; @@ -280,16 +274,16 @@ DiscountAmount = a.DiscountAmount ?? 0, FinishTime = a.FinishTime, Id = a.Id, - LifePayOrderStatus = a.LifePayOrderStatus?? 0, + LifePayOrderStatus = a.LifePayOrderStatus ?? 0, LifePayOrderType = a.LifePayOrderType, LifePayType = a.LifePayType, OrderNo = a.OrderNo, PayAmount = a.PayAmount ?? 0, PhoneNumber = a.PhoneNumber, - RechargeAmount = a.RechargeAmount??0, + RechargeAmount = a.RechargeAmount ?? 0, UserId = a.UserId, OutOrderNo = a.OutOrderNo, - PayStatus = a.PayStatus?? 0, + PayStatus = a.PayStatus ?? 0, PayTime = a.PayTime, ACOOLYOrderNo = a.ACOOLYOrderNo, RefundCredentialsImgUrl = a.RefundCredentialsImgUrl.GetOssPath(), @@ -300,6 +294,7 @@ RefundTime = a.RefundTime, ChannelName = b.ChannlesName, ActualRechargeAmount = a.RechargeAmount, + ActualReceivedAmount = a.ActualReceivedAmount, PlatformDeductionAmount = a.PlatformDeductionAmount, ACOOLYStatus = a.ACOOLYStatus, LifePayRefundStatus = a.LifePayRefundStatus, @@ -388,7 +383,7 @@ ACOOLYStatus = x.ACOOLYStatus, RefundApplyRemark = x.RefundApplyRemark, RechargeAmount = x.RechargeAmount, - ActualReceivedAmount = x.ActualReceivedAmount.ToString("F2"), + ActualReceivedAmount = (x.ActualReceivedAmount ?? 0).ToString("F2"), LifePayRefundStatus = x.LifePayRefundStatus, OrderNo = x.OrderNo, @@ -567,7 +562,7 @@ DiscountAmount = x.DiscountAmount ?? 0, FinishTime = x.FinishTime, Id = x.Id, - LifePayOrderStatus = x.LifePayOrderStatus?? 0 , + LifePayOrderStatus = x.LifePayOrderStatus ?? 0, LifePayOrderType = x.LifePayOrderType, LifePayType = x.LifePayType, OrderNo = x.OrderNo, @@ -610,7 +605,7 @@ public async Task<List<CreateEditPayChannelsInput>> GetLifePayChannlesAllList(QueryLifePayChannlesInput input) { - return await GetLifePayChannlesListFilter().WhereIf(input.Status.HasValue,x => x.Status == input.Status).ToListAsync(); + return await GetLifePayChannlesListFilter().WhereIf(input.Status.HasValue, x => x.Status == input.Status).ToListAsync(); } public async Task<CreateEditPayChannelsInput> GetLifePayChannlesDto(Guid id) @@ -908,7 +903,7 @@ return await _wxPayApi.WxPayTradeQuery(outTradeNo); } - + #endregion @@ -930,18 +925,17 @@ var channle = await GetLifePayChannlesDtoByNum(input.ChannelId); CheckExtensions.IfTrueThrowUserFriendlyException(channle == null, "娓犻亾涓嶅瓨鍦�"); - var repeatOrder = await _lifePayOrderRepository.Where(x => x.LifePayOrderType == LifePayOrderTypeEnum.PhoneOrder + var repeatOrder = await _lifePayOrderRepository.Where(x => x.LifePayOrderType == LifePayOrderTypeEnum.PhoneOrder && x.PayStatus == LifePayStatusEnum.宸叉敮浠� && x.LifePayOrderStatus == LifePayOrderStatusEnum.鍏呭�间腑 && x.OrderParamDetailJsonStr.Contains(input.ProductData.Phone)).AnyAsync(); - CheckExtensions.IfTrueThrowUserFriendlyException(repeatOrder, "鎮ㄦ湁鍚屾埛鍙疯鍗曟鍦ㄥ厖鍊间腑锛岃鍕块噸澶嶅厖鍊�"); + CheckExtensions.IfTrueThrowUserFriendlyException(repeatOrder, "鎮ㄦ湁鍚屾埛鍙疯鍗曟鍦ㄥ厖鍊间腑锛岃鍕块噸澶嶅厖鍊�"); var rate = await GetLifePayRate(channle, LifePayRateTypeEnum.榛樿璇濊垂鎶樻墸); var amount = CalculateAmount(input.ProductData.ParValue, rate); var platformRate = await _lifePayRateRepository.FirstOrDefaultAsync(r => r.RateType == LifePayRateTypeEnum.渚涘簲鍟嗘姌鎵d环); - var orderInput = new CreateLifePayOrderInput { @@ -1377,7 +1371,7 @@ /// <param name="orderNo"></param> /// <param name="outOrderNo"></param> /// <returns></returns> - public async Task ACOOLYOrderNotifyHandler(string orderNo, string acoolyOrderNo, LifePayOrderStatusEnum status, ACOOLYStatusEnum acoolyStatus, decimal payAmount, string refundApplyRemark) + public async Task ACOOLYOrderNotifyHandler(string orderNo, string acoolyOrderNo, LifePayOrderStatusEnum status, ACOOLYStatusEnum acoolyStatus, decimal payAmount, string refundApplyRemark, decimal? parValue = 0, decimal? actualParValue = 0) { var order = await _lifePayOrderRepository.Where(x => x.OrderNo == orderNo).FirstOrDefaultAsync(); CheckExtensions.IfTrueThrowUserFriendlyException(order == null, "璁㈠崟涓嶅瓨鍦�"); @@ -1387,7 +1381,7 @@ return; } - // order.PlatformDeductionAmount = payAmount; + //order.PlatformDeductionAmount = payAmount; if (acoolyOrderNo.IsNotNullOrEmpty()) { @@ -1406,7 +1400,12 @@ order.LifePayOrderStatus = status; order.ACOOLYStatus = acoolyStatus; - order.FinishTime = DateTime.Now; + if (order.LifePayOrderStatus == LifePayOrderStatusEnum.宸插畬鎴� + || order.LifePayOrderStatus == LifePayOrderStatusEnum.宸查��娆�) + { + order.FinishTime = DateTime.Now; + } + await _lifePayOrderRepository.UpdateAsync(order); if (order.LifePayOrderStatus == LifePayOrderStatusEnum.宸插畬鎴�) @@ -1433,7 +1432,7 @@ /// 鍒涘缓鐢熸椿缂磋垂娑堣垂璁板綍 await _lifePayOrderService.CreatLifePayConsumption(acoolyStatus, order.OrderNo, order.ACOOLYOrderNo, - order.PlatformDeductionAmount ?? 0, order.ChannelId, order.CreationTime, order.FinishTime); + order.PlatformDeductionAmount ?? 0, order.ChannelId, order.CreationTime, order.FinishTime, order.ChannleRate, parValue, actualParValue); } /// <summary> @@ -1694,6 +1693,10 @@ { order.LifePayOrderStatus = LifePayOrderStatusEnum.宸插畬鎴�; } + else + { + order.LifePayOrderStatus = LifePayOrderStatusEnum.閫�娆惧け璐�; + } order.RefundCheckRemark = input.RefundCheckRemark; order.RefundCheckUserId = CurrentUser.Id; @@ -1719,13 +1722,22 @@ { var dto = await _lifePayChannlesRep.FirstOrDefaultAsync(r => r.Id == input.Id.Value); CheckExtensions.IfTrueThrowUserFriendlyException(dto == null, "鏈幏鍙栧埌娓犻亾鎶樻墸鏁版嵁"); + if (!string.IsNullOrWhiteSpace(input.PromoterIdNumber) || !string.IsNullOrWhiteSpace(input.PromoterName)) + { + var promoter = await lifePayPromoterRepository.FirstOrDefaultAsync(it => it.IdNumber == input.PromoterIdNumber && it.Name == input.PromoterName); + CheckExtensions.IfTrueThrowUserFriendlyException(promoter == null, "璇ユ帹骞夸汉涓嶅瓨鍦�"); + dto.PromoterId = promoter.Id; + } + dto.ChannlesName = input.ChannlesName; dto.ChannlesNum = input.ChannlesNum; dto.ChannlesRate = input.ChannlesRate; dto.ChannlesRakeRate = input.ChannlesRakeRate; dto.SwitchType = input.SwitchType; dto.ChannlesType = input.ChannlesType; - dto.Status = input.Status; + dto.AgentType = input.AgentType; + dto.AreaProvinceId = input.AreaProvinceId; + dto.AreaCityId = input.AreaCityId; #region 璁板綍鏃ュ織 await LifePayOrderHistory("娓犻亾绠$悊", "缂栬緫", input.Id.Value, TableType.LifePayChannles); @@ -1737,6 +1749,13 @@ CheckExtensions.IfTrueThrowUserFriendlyException(input.ChannlesRate < 0.01m, "娓犻亾鎶樻墸璁剧疆閿欒"); input.Id = Guid.NewGuid(); var entity = ObjectMapper.Map<CreateEditPayChannelsInput, LifePayChannles>(input); + if (!string.IsNullOrWhiteSpace(input.PromoterIdNumber) || !string.IsNullOrWhiteSpace(input.PromoterName)) + { + var promoter = await lifePayPromoterRepository.FirstOrDefaultAsync(it => it.IdNumber == input.PromoterIdNumber && it.Name == input.PromoterName); + CheckExtensions.IfTrueThrowUserFriendlyException(promoter == null, "璇ユ帹骞夸汉涓嶅瓨鍦�"); + entity.PromoterId = promoter.Id; + } + await _lifePayChannlesRep.InsertAsync(entity); #region 璁板綍鏃ュ織 @@ -2186,20 +2205,28 @@ }); return result; } + private IQueryable<CreateEditPayChannelsInput> GetLifePayChannlesListFilter() { - return _lifePayChannlesRep.Select(x => - new CreateEditPayChannelsInput - { - Id = x.Id, - ChannlesRate = x.ChannlesRate, - ChannlesRakeRate = x.ChannlesRakeRate, - ChannlesName = x.ChannlesName, - ChannlesNum = x.ChannlesNum, - Status = x.Status, - SwitchType = x.SwitchType, - ChannlesType = x.ChannlesType, - }); + return from x in _lifePayChannlesRep + join p in lifePayPromoterRepository on x.PromoterId equals p.Id into pg + from pgd in pg.DefaultIfEmpty() + select new CreateEditPayChannelsInput + { + Id = x.Id, + ChannlesRate = x.ChannlesRate, + ChannlesRakeRate = x.ChannlesRakeRate, + ChannlesName = x.ChannlesName, + ChannlesNum = x.ChannlesNum, + Status = x.Status, + SwitchType = x.SwitchType, + ChannlesType = x.ChannlesType, + AgentType = x.AgentType, + AreaProvinceId = x.AreaProvinceId, + AreaCityId = x.AreaCityId, + PromoterIdNumber = pgd.IdNumber, + PromoterName = pgd.Name, + }; } public async Task<OrderPriceReturn> GetOrderPrice(decimal price, decimal priceAmount, decimal platformRate, decimal channleRate, @@ -2271,12 +2298,12 @@ default: break; } - + return new SetPayTypeReturn() { Desc = desc, OrderNo = order.OrderNo, - PayAmount = order.PayAmount.HasValue? order.PayAmount.Value : 0, + PayAmount = order.PayAmount.HasValue ? order.PayAmount.Value : 0, LifePayType = lifePayType, }; } -- Gitblit v1.9.1