From ad8e329a739839bf5ce80b42d931b655c2c20356 Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期一, 09 六月 2025 15:40:30 +0800
Subject: [PATCH] feat:新增接口x2 GET/api/Promoter/GetChannelConsultationById获取渠道咨询Id GET/api/Promoter/GetPromoter获取推广员信息
---
LifePayment/LifePayment.Application/LifePay/LifePayService.cs | 105 +++++++++++++++++++++++++++++++++++++---------------
1 files changed, 74 insertions(+), 31 deletions(-)
diff --git a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
index bb94bcb..25fc798 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;
@@ -133,6 +127,16 @@
public async Task<PhoneParValueResponse> GetPhoneParValue()
{
return await _aCOOLYManager.PhoneParValue(new ACOOLYRequestBaseInput());
+ }
+
+ /// <summary>
+ /// 璇濊垂璁㈠崟鏌ヨ
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ public async Task<QueryPhoneOrderResponse> QueryPhoneOrder(QueryPhoneOrderRequestInput input)
+ {
+ return await _aCOOLYManager.QueryPhoneOrder(input);
}
/// <summary>
@@ -359,6 +363,7 @@
RefundPrice = a.RefundPrice,
ChannelName = b.ChannlesName,
ActualRechargeAmount = a.RechargeAmount,
+ ActualReceivedAmount = a.ActualReceivedAmount,
PlatformDeductionAmount = a.PlatformDeductionAmount,
ACOOLYStatus = a.ACOOLYStatus,
LifePayRefundStatus = a.LifePayRefundStatus,
@@ -459,6 +464,7 @@
PremiumPrice = orderpirce.PremiumPrice,
Profit = orderpirce.Profit,
RefundOrderNo = order.RefundOrderNo,
+ ActualReceivedAmount = order.ActualReceivedAmount
};
return result;
@@ -943,7 +949,6 @@
var platformRate = await _lifePayRateRepository.FirstOrDefaultAsync(r => r.RateType == LifePayRateTypeEnum.渚涘簲鍟嗘姌鎵ｄ环);
-
var orderInput = new CreateLifePayOrderInput
{
OrderNo = channle.ChannlesNum + CreateOrderNo(),
@@ -1378,17 +1383,18 @@
/// <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, "璁㈠崟涓嶅瓨鍦�");
- if (order.LifePayOrderStatus == LifePayOrderStatusEnum.宸插畬鎴�)
+ if (order.LifePayOrderStatus == status && order.ACOOLYStatus == acoolyStatus)
{
+ _logger.LogInformation($"璁㈠崟锛坽orderNo}锛夊凡澶勭悊璇ョ姸鎬�");
return;
}
- // order.PlatformDeductionAmount = payAmount;
+ order.ActualReceivedAmount = actualParValue;
if (acoolyOrderNo.IsNotNullOrEmpty())
{
@@ -1407,7 +1413,14 @@
order.LifePayOrderStatus = status;
order.ACOOLYStatus = acoolyStatus;
- order.FinishTime = DateTime.Now;
+ if (order.LifePayOrderStatus == LifePayOrderStatusEnum.宸插畬鎴�
+ || order.LifePayOrderStatus == LifePayOrderStatusEnum.宸查��娆�)
+ {
+ order.FinishTime = DateTime.Now;
+ order.PlatformDeductionAmount = Math.Round((order.ActualReceivedAmount ?? 0) * (order.PlatformRate ?? 0) / 100, 2);
+ order.RefundPrice = Math.Round((1 - ((order.ActualReceivedAmount ?? 0) / (order.RechargeAmount ?? 0))) * (order.PayAmount ?? 0), 2);
+ }
+
await _lifePayOrderRepository.UpdateAsync(order);
if (order.LifePayOrderStatus == LifePayOrderStatusEnum.宸插畬鎴�)
@@ -1434,7 +1447,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>
@@ -1515,6 +1528,8 @@
order.RefundTime = DateTime.Now;
order.RefundCheckUserId = CurrentUser.Id;
order.RefundPrice = input.RefundPrice;
+ order.ActualReceivedAmount = Math.Round((1 - ((order.RefundPrice ?? 0) / (order.PayAmount ?? 0))) * (order.RechargeAmount ?? 0), 2);
+ order.PlatformDeductionAmount = Math.Round((order.ActualReceivedAmount ?? 0) * (order.PlatformRate ?? 0) / 100, 2);
//await _lifePayOrderRepository.UpdateAsync(order);
@@ -1695,6 +1710,10 @@
{
order.LifePayOrderStatus = LifePayOrderStatusEnum.宸插畬鎴�;
}
+ else
+ {
+ order.LifePayOrderStatus = LifePayOrderStatusEnum.閫�娆惧け璐�;
+ }
order.RefundCheckRemark = input.RefundCheckRemark;
order.RefundCheckUserId = CurrentUser.Id;
@@ -1720,13 +1739,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);
@@ -1738,6 +1766,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 璁板綍鏃ュ織
@@ -2187,20 +2222,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,
--
Gitblit v1.9.1