From 1605af1ced748313e99f38e5eb6888768fbc7d54 Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期三, 11 六月 2025 14:46:43 +0800
Subject: [PATCH] fix:支付回调和供应商回调的并发问题
---
LifePayment/LifePayment.Application/LifePay/LifePayService.cs | 441 +++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 335 insertions(+), 106 deletions(-)
diff --git a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
index 8d5907a..5581eb3 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;
@@ -7,29 +8,22 @@
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using Newtonsoft.Json;
+using StackExchange.Redis;
using System;
using System.Collections.Generic;
+using System.Data;
using System.Linq;
using System.Linq.Dynamic.Core;
using System.Threading.Tasks;
using Volo.Abp;
using Volo.Abp.Application.Services;
using Volo.Abp.Data;
+using Volo.Abp.DistributedLocking;
using Volo.Abp.Domain.Repositories;
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;
namespace LifePayment.Application;
@@ -51,6 +45,7 @@
private readonly ILifePayOrderService _lifePayOrderService;
private readonly IDataFilter dataFilter;
private readonly IChannelFilter _channelFilter;
+ private readonly IAbpDistributedLock distributedLock;
private readonly IAliPayApi _aliPayApi;
private readonly IAlipayInterfaceManager _alipayInterfaceManager;
private readonly IWxPayApi _wxPayApi;
@@ -58,10 +53,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,
@@ -78,10 +75,12 @@
IRepository<LifePayChannles, Guid> lifePayChannlesRep,
IRepository<LifePayAccount, Guid> lifePayAccount,
IDataFilter dataFilter,
- IChannelFilter channelFilter)
+ IChannelFilter channelFilter,
+ IAbpDistributedLock distributedLock)
{
_logger = logger;
_aCOOLYManager = aCOOLYManager;
+ this.lifePayPromoterRepository = lifePayPromoterRepository;
_lifePayRateRepository = lifePayRateRepository;
_lifePayOrderRepository = lifePayOrderRepository;
_lifePayUserRepository = lifePayUserRepository;
@@ -99,11 +98,11 @@
_lifePayAccount = lifePayAccount;
this.dataFilter = dataFilter;
_channelFilter = channelFilter;
+ this.distributedLock = distributedLock;
_operateHistory = operateHistory;
}
#region 鏌ヨ
-
/// <summary>
/// 鑾峰彇鐢佃垂闈㈠��
@@ -135,6 +134,16 @@
}
/// <summary>
+ /// 璇濊垂璁㈠崟鏌ヨ
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ public async Task<QueryPhoneOrderResponse> QueryPhoneOrder(QueryPhoneOrderRequestInput input)
+ {
+ return await _aCOOLYManager.QueryPhoneOrder(input);
+ }
+
+ /// <summary>
/// 鑾峰彇璇濊垂闈㈠��
/// </summary>
/// <param name="input"></param>
@@ -159,7 +168,7 @@
/// <returns></returns>
public async Task<List<LifePayRateListOutput>> GetRate()
{
- return await _lifePayRateRepository.Where(x => x.IsDeleted == false).Select(x => new LifePayRateListOutput() { Id = x.Id, Rate = x.Rate, RateType = x.RateType })
+ return await _lifePayRateRepository.Select(x => new LifePayRateListOutput() { Id = x.Id, Rate = x.Rate, RateType = x.RateType })
.ToListAsync();
}
@@ -169,7 +178,7 @@
/// <returns></returns>
public async Task<ChannelRateOutput> GetChannelRate(ChannelsBaseInput input)
{
- return _lifePayChannlesRep.Where(x => x.IsDeleted == false && x.ChannlesNum == input.CheckChannelId).Select(x => new ChannelRateOutput() { ChannlesRate = x.ChannlesRate })
+ return _lifePayChannlesRep.Where(x => x.ChannlesNum == input.CheckChannelId).Select(x => new ChannelRateOutput() { ChannlesRate = x.ChannlesRate })
.FirstOrDefault();
}
@@ -179,7 +188,7 @@
/// <returns></returns>
public async Task<List<LifePayPremiumListOutput>> GetPremium()
{
- return await _lifePayPremiumRepository.Where(x => x.IsDeleted == false).Select(x => new LifePayPremiumListOutput() { Id = x.Id, Rate = x.Rate, PremiumType = x.PremiumType })
+ return await _lifePayPremiumRepository.Select(x => new LifePayPremiumListOutput() { Id = x.Id, Rate = x.Rate, PremiumType = x.PremiumType })
.ToListAsync();
}
@@ -189,7 +198,7 @@
/// <returns></returns>
public async Task<List<LifePayIntroInfoOutput>> GetIntroInfo(LifePayOrderTypeEnum lifePayType)
{
- return await _lifePayIntroInfoRepository.Where(x => x.IsDeleted == false && x.LifePayType == lifePayType).OrderBy(x => x.Sequence)
+ return await _lifePayIntroInfoRepository.Where(x => x.LifePayType == lifePayType).OrderBy(x => x.Sequence)
.Select(x => new LifePayIntroInfoOutput() { Type = x.Type, ContentSummary = x.ContentSummary, Content = x.Content, LifePayType = x.LifePayType, Path = x.Path, Sequence = x.Sequence })
.ToListAsync();
}
@@ -201,7 +210,7 @@
/// <returns></returns>
public async Task<PageOutput<UserListOutput>> GetUserPage(QueryUserPageInput input)
{
- return await _channelFilter.GetChannelLifePayUserFilter(_lifePayUserRepository).Where(x => x.IsDeleted == false)
+ return await _channelFilter.GetChannelLifePayUserFilter(_lifePayUserRepository)
.WhereIf(!string.IsNullOrEmpty(input.QueryCondition), x => x.PhoneNumber.Contains(input.QueryCondition) || x.Name.Contains(input.QueryCondition))
.WhereIf(input.CreationTimeBegin.HasValue, x => x.CreationTime >= input.CreationTimeBegin)
.WhereIf(input.CreationTimeEnd.HasValue, x => x.CreationTime <= input.CreationTimeEnd)
@@ -279,16 +288,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(),
@@ -299,11 +308,45 @@
RefundTime = a.RefundTime,
ChannelName = b.ChannlesName,
ActualRechargeAmount = a.RechargeAmount,
+ ActualReceivedAmount = a.ActualReceivedAmount,
PlatformDeductionAmount = a.PlatformDeductionAmount,
ACOOLYStatus = a.ACOOLYStatus,
LifePayRefundStatus = a.LifePayRefundStatus,
+ OrderParamDetailJsonStr = a.OrderParamDetailJsonStr,
}).GetPageResult(input.PageModel);
-
+ if (result != null && result.Data != null && result.Data.Count > 0)
+ {
+ foreach (var s in result.Data)
+ {
+ if (!string.IsNullOrWhiteSpace(s.OrderParamDetailJsonStr))
+ {
+ if (s.LifePayOrderType == LifePayOrderTypeEnum.PhoneOrder)
+ {
+ var name = s.OrderParamDetailJsonStr.JsonToObject<LifePhoneData>()?.IspCode;
+ if (Enum.TryParse<IspCodeEnum>(name, true, out var @enum))
+ {
+ s.Operator = @enum.GetDescription();
+ }
+ }
+ else if (s.LifePayOrderType == LifePayOrderTypeEnum.ElectricOrder)
+ {
+ var name = s.OrderParamDetailJsonStr.JsonToObject<LifeElectricData>()?.ElectricType;
+ if (Enum.TryParse<ElectricTypeEnum>(name, true, out var @enum))
+ {
+ s.Operator = @enum.GetDescription();
+ }
+ }
+ else if (s.LifePayOrderType == LifePayOrderTypeEnum.GasOrder)
+ {
+ var name = s.OrderParamDetailJsonStr.JsonToObject<LifeGasData>()?.GasOrgType;
+ if (Enum.TryParse<GasOrgCodeEnum>(name, true, out var @enum))
+ {
+ s.Operator = @enum.GetDescription();
+ }
+ }
+ }
+ }
+ }
return result;
}
@@ -327,7 +370,7 @@
.WhereIf(input.ACOOLYStatus.HasValue, x => x.ACOOLYStatus == input.ACOOLYStatus.Value)
.WhereIf(input.LifePayOrderType.HasValue, x => x.LifePayOrderType == input.LifePayOrderType.Value)
.WhereIf(input.UserId.HasValue, x => x.UserId == input.UserId.Value)
- .WhereIf(input.KeyWords.IsNotNullOrEmpty(), x => x.PhoneNumber.Contains(input.KeyWords) || x.OrderNo.Contains(input.KeyWords) || x.OutOrderNo.Contains(input.KeyWords) || x.ACOOLYOrderNo.Contains(input.KeyWords))
+ .WhereIf(input.KeyWords.IsNotNullOrEmpty(), x => x.PhoneNumber.Contains(input.KeyWords) || x.RefundOrderNo.Contains(input.KeyWords) || x.OutOrderNo.Contains(input.KeyWords) || x.ACOOLYOrderNo.Contains(input.KeyWords) || x.OrderNo.Contains(input.KeyWords))
join b in _lifePayChannlesRep on a.ChannelId equals b.ChannlesNum into temp
from b in temp.DefaultIfEmpty()
select new LifePayOrderListOutput
@@ -357,6 +400,7 @@
RefundPrice = a.RefundPrice,
ChannelName = b.ChannlesName,
ActualRechargeAmount = a.RechargeAmount,
+ ActualReceivedAmount = a.ActualReceivedAmount,
PlatformDeductionAmount = a.PlatformDeductionAmount,
ACOOLYStatus = a.ACOOLYStatus,
LifePayRefundStatus = a.LifePayRefundStatus,
@@ -387,8 +431,9 @@
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,
}).OrderByDescending(r => r.CreationTime).ToListAsync();
var i = 0;
@@ -405,6 +450,7 @@
s.FinishTimeStr = !s.FinishTime.HasValue ? string.Empty : s.FinishTime.Value.ToString(LifePaymentConstant.DateTimeFormatStr.yyyyMMddHHmm);
s.RefundApplyTimeStr = !s.RefundApplyTime.HasValue ? string.Empty : s.RefundApplyTime.Value.ToString(LifePaymentConstant.DateTimeFormatStr.yyyyMMddHHmm);
});
+ CheckExtensions.IfTrueThrowUserFriendlyException(result.IsNullOrEmpty(), "鏆傛棤鏁版嵁瀵煎嚭");
return result;
}
@@ -456,6 +502,7 @@
PremiumPrice = orderpirce.PremiumPrice,
Profit = orderpirce.Profit,
RefundOrderNo = order.RefundOrderNo,
+ ActualReceivedAmount = order.ActualReceivedAmount
};
return result;
@@ -466,7 +513,7 @@
var order = await _lifePayOrderRepository.Where(x => x.OrderNo == orderNo).FirstOrDefaultAsync();
var platformRate = await _lifePayRateRepository.FirstOrDefaultAsync(r => r.RateType == LifePayRateTypeEnum.渚涘簲鍟嗘姌鎵ｄ环);
var channle = await _lifePayChannlesRep.FirstOrDefaultAsync(r => r.ChannlesNum == order.ChannelId);
- var premium = await _lifePayPremiumRepository.Where(x => x.IsDeleted == false && x.PremiumType == order.LifePayType).FirstOrDefaultAsync();
+ var premium = await _lifePayPremiumRepository.Where(x => x.PremiumType == order.LifePayType).FirstOrDefaultAsync();
CheckExtensions.IfTrueThrowUserFriendlyException(order == null, "璁㈠崟涓嶅瓨鍦�");
var user = await _lifePayUserRepository.FirstOrDefaultAsync(x => x.Id == order.UserId);
@@ -565,7 +612,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,
@@ -606,9 +653,9 @@
return await GetLifePayChannlesListFilter().GetPageResult(input.PageModel);
}
- public async Task<List<CreateEditPayChannelsInput>> GetLifePayChannlesAllList()
+ public async Task<List<CreateEditPayChannelsInput>> GetLifePayChannlesAllList(QueryLifePayChannlesInput input)
{
- return await GetLifePayChannlesListFilter().Where(x => x.Status == LifePayChannelsStatsEnum.鍚敤).ToListAsync();
+ return await GetLifePayChannlesListFilter().WhereIf(input.Status.HasValue, x => x.Status == input.Status).ToListAsync();
}
public async Task<CreateEditPayChannelsInput> GetLifePayChannlesDto(Guid id)
@@ -668,7 +715,7 @@
return new PageOutput<UserAccountOutput>();
}
- var result = await _lifePayAccount.Where(x => x.UserId == input.UserId && x.IsDeleted == false)
+ var result = await _lifePayAccount.Where(x => x.UserId == input.UserId)
.WhereIf(input.LifePayOrderType.HasValue, x => x.LifePayType == input.LifePayOrderType)
.OrderByDescending(x => x.CreationTime)
.Select(x =>
@@ -695,7 +742,7 @@
return new List<UserAccountOutput>();
}
- var result = await _lifePayAccount.Where(x => x.UserId == input.UserId && x.IsDeleted == false)
+ var result = await _lifePayAccount.Where(x => x.UserId == input.UserId)
.WhereIf(input.LifePayOrderType.HasValue, x => x.LifePayType == input.LifePayOrderType)
.OrderByDescending(x => x.CreationTime)
.Select(x =>
@@ -759,7 +806,8 @@
ACOOLYStatus = x.ACOOLYStatus,
//RefundApplyRemark = x.RefundApplyRemark,
ChannelName = x.ChannelName,
- PlatformPrice = x.PlatformDeductionAmount.HasValue ? x.PlatformDeductionAmount.Value : 0.00m
+ PlatformPrice = x.PlatformDeductionAmount.HasValue ? x.PlatformDeductionAmount.Value : 0.00m,
+ OrderParamDetailJsonStr = x.OrderParamDetailJsonStr,
}).OrderByDescending(r => r.CreationTime).ToListAsync();
var i = 0;
result.ForEach(s =>
@@ -777,9 +825,112 @@
s.ACOOLYStatusStr = s.ACOOLYStatus.GetDescription();
s.LifePayOrderStatusStr = s.LifePayOrderStatus.GetDescription();
s.FinishTimeStr = !s.FinishTime.HasValue ? string.Empty : s.FinishTime.Value.ToString(LifePaymentConstant.DateTimeFormatStr.yyyyMMddHHmmss);
+ if (!string.IsNullOrWhiteSpace(s.OrderParamDetailJsonStr))
+ {
+ if (s.LifePayOrderType == LifePayOrderTypeEnum.PhoneOrder)
+ {
+ var name = s.OrderParamDetailJsonStr.JsonToObject<LifePhoneData>()?.IspCode;
+ if (Enum.TryParse<IspCodeEnum>(name, true, out var @enum))
+ {
+ s.Operator = @enum.GetDescription();
+ }
+ }
+ else if (s.LifePayOrderType == LifePayOrderTypeEnum.ElectricOrder)
+ {
+ var name = s.OrderParamDetailJsonStr.JsonToObject<LifeElectricData>()?.ElectricType;
+ if (Enum.TryParse<ElectricTypeEnum>(name, true, out var @enum))
+ {
+ s.Operator = @enum.GetDescription();
+ }
+ }
+ else if (s.LifePayOrderType == LifePayOrderTypeEnum.GasOrder)
+ {
+ var name = s.OrderParamDetailJsonStr.JsonToObject<LifeGasData>()?.GasOrgType;
+ if (Enum.TryParse<GasOrgCodeEnum>(name, true, out var @enum))
+ {
+ s.Operator = @enum.GetDescription();
+ }
+ }
+ }
});
+ CheckExtensions.IfTrueThrowUserFriendlyException(result.IsNullOrEmpty(), "鏆傛棤鏁版嵁瀵煎嚭");
return result;
}
+
+ public async Task<List<LifePayOrderListTemplateForChannle>> GetLifePayOrderPageExportForChannle(QueryLifePayOrderListInput input)
+ {
+ var result = await (await GetLifePayOrderListFilter(input)).Select(x => new LifePayOrderListTemplateForChannle
+ {
+ DiscountAmount = x.DiscountAmount,
+ FinishTime = x.FinishTime,
+ LifePayOrderStatus = x.LifePayOrderStatus,
+ LifePayOrderType = x.LifePayOrderType,
+ LifePayType = x.LifePayType,
+ OrderNo = x.OrderNo,
+ PayAmount = x.PayAmount,
+ ActualRechargeAmount = x.RechargeAmount,
+ PhoneNumber = x.PhoneNumber,
+ RechargeAmount = x.RechargeAmount,
+ OutOrderNo = x.OutOrderNo,
+ PayStatus = x.PayStatus,
+ PayTime = x.PayTime,
+ ACOOLYOrderNo = x.ACOOLYOrderNo,
+ CreationTime = x.CreationTime,
+ LifePayRefundStatus = x.LifePayRefundStatus,
+ ACOOLYStatus = x.ACOOLYStatus,
+ //RefundApplyRemark = x.RefundApplyRemark,
+ ChannelName = x.ChannelName,
+ PlatformPrice = x.PlatformDeductionAmount.HasValue ? x.PlatformDeductionAmount.Value : 0.00m,
+ OrderParamDetailJsonStr = x.OrderParamDetailJsonStr,
+ }).OrderByDescending(r => r.CreationTime).ToListAsync();
+ var i = 0;
+ result.ForEach(s =>
+ {
+ s.SerialNumber = ++i;
+ s.LifePayOrderTypeStr = s.LifePayOrderType.GetDescription();
+ s.CreationTimeStr = s.CreationTime.ToString(LifePaymentConstant.DateTimeFormatStr.yyyyMMddHHmmss);
+ s.RechargeAmountStr = s.RechargeAmount.ToString("F2");
+ s.PayAmountStr = s.PayAmount.ToString("F2");
+ s.PayTimeStr = !s.PayTime.HasValue ? string.Empty : s.PayTime.Value.ToString(LifePaymentConstant.DateTimeFormatStr.yyyyMMddHHmmss);
+ s.LifePayTypeStr = s.LifePayType.GetDescription();
+ s.PayStatusStr = s.PayStatus.GetDescription();
+ s.ActualRechargeAmountStr = s.ActualRechargeAmount.ToString("F2");
+ s.LifePayRefundStatusStr = s.LifePayRefundStatus == LifePayRefundStatusEnum.鏃犻渶閫�娆� ? "" : s.LifePayRefundStatus.GetDescription();
+ s.ACOOLYStatusStr = s.ACOOLYStatus.GetDescription();
+ s.LifePayOrderStatusStr = s.LifePayOrderStatus.GetDescription();
+ s.FinishTimeStr = !s.FinishTime.HasValue ? string.Empty : s.FinishTime.Value.ToString(LifePaymentConstant.DateTimeFormatStr.yyyyMMddHHmmss);
+ if (!string.IsNullOrWhiteSpace(s.OrderParamDetailJsonStr))
+ {
+ if (s.LifePayOrderType == LifePayOrderTypeEnum.PhoneOrder)
+ {
+ var name = s.OrderParamDetailJsonStr.JsonToObject<LifePhoneData>()?.IspCode;
+ if (Enum.TryParse<IspCodeEnum>(name, true, out var @enum))
+ {
+ s.Operator = @enum.GetDescription();
+ }
+ }
+ else if (s.LifePayOrderType == LifePayOrderTypeEnum.ElectricOrder)
+ {
+ var name = s.OrderParamDetailJsonStr.JsonToObject<LifeElectricData>()?.ElectricType;
+ if (Enum.TryParse<ElectricTypeEnum>(name, true, out var @enum))
+ {
+ s.Operator = @enum.GetDescription();
+ }
+ }
+ else if (s.LifePayOrderType == LifePayOrderTypeEnum.GasOrder)
+ {
+ var name = s.OrderParamDetailJsonStr.JsonToObject<LifeGasData>()?.GasOrgType;
+ if (Enum.TryParse<GasOrgCodeEnum>(name, true, out var @enum))
+ {
+ s.Operator = @enum.GetDescription();
+ }
+ }
+ }
+ });
+ CheckExtensions.IfTrueThrowUserFriendlyException(result.IsNullOrEmpty(), "鏆傛棤鏁版嵁瀵煎嚭");
+ return result;
+ }
+
public async Task<string> GetBillErceiptExport(string orderNo)
{
try
@@ -876,7 +1027,24 @@
/// <returns></returns>
public async Task<WxPayDomesticRefundsQueryReponse> WxPayDomesticRefundsQuery(string outTradeNo)
{
- return await _wxPayApi.WxPayDomesticRefundsQuery(outTradeNo);
+ var order = await _lifePayOrderRepository.Where(x => x.RefundOrderNo == outTradeNo).FirstOrDefaultAsync();
+ CheckExtensions.IfTrueThrowUserFriendlyException(order == null, "鏈壘鍒拌鍗曚俊鎭�");
+ var result = await _wxPayApi.WxPayDomesticRefundsQuery(outTradeNo);
+ if (order.LifePayRefundStatus != LifePayRefundStatusEnum.宸查��娆� && result.Code == WxpayResultCode.Success && result.Status == WxPayRefundStatus.閫�娆炬垚鍔�)
+ {
+ order.LifePayOrderStatus = LifePayOrderStatusEnum.宸查��娆�;
+ order.LifePayRefundStatus = LifePayRefundStatusEnum.宸查��娆�;
+ await _lifePayOrderService.AddLifePayExpensesReceipts(new AddLifePayExpensesReceiptsInput()
+ {
+ OrderNo = order.OrderNo,
+ OutRefundNo = order.RefundOrderNo,
+ OutOrderNo = order.OutOrderNo,
+ LifePayType = LifePayTypeEnum.AliPay,
+ ExpensesReceiptsType = ExpensesReceiptsTypeEnum.Receipts
+ });
+ }
+ return result;
+
}
/// <summary>
@@ -889,7 +1057,7 @@
return await _wxPayApi.WxPayTradeQuery(outTradeNo);
}
-
+
#endregion
@@ -911,20 +1079,17 @@
var channle = await GetLifePayChannlesDtoByNum(input.ChannelId);
CheckExtensions.IfTrueThrowUserFriendlyException(channle == null, "娓犻亾涓嶅瓨鍦�");
- var repeatOrder = await _lifePayOrderRepository.Where(x => x.LifePayOrderType == LifePayOrderTypeEnum.PhoneOrder && x.PayStatus == LifePayStatusEnum.宸叉敮浠�
+ var repeatOrder = await _lifePayOrderRepository.Where(x => x.LifePayOrderType == LifePayOrderTypeEnum.PhoneOrder
+ && x.PayStatus == LifePayStatusEnum.宸叉敮浠�
&& x.LifePayOrderStatus == LifePayOrderStatusEnum.鍏呭�间腑
- && x.OrderParamDetailJsonStr.Contains(input.ProductData.Phone)).ToListAsync();
- CheckExtensions.IfTrueThrowUserFriendlyException(repeatOrder.Count() > 0, "鎮ㄦ湁鍚屾埛鍙疯鍗曟鍦ㄥ厖鍊间腑锛岃鍕块噸澶嶅厖鍊�");
-
- //var rate = await GetRate();
- //CheckExtensions.IfTrueThrowUserFriendlyException(rate.IsNullOrEmpty(), "鏈厤缃姌鎵�");
+ && x.OrderParamDetailJsonStr.Contains(input.ProductData.Phone)).AnyAsync();
+ 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.渚涘簲鍟嗘姌鎵ｄ环);
-
var orderInput = new CreateLifePayOrderInput
{
@@ -944,7 +1109,6 @@
PlatformDeductionAmount = amount.RechargeAmount * platformRate.Rate / 100,
ChannleRate = rate,
ChannlesRakeRate = channle.ChannlesRakeRate,
- //ChannlesRakePrice = amount.RechargeAmount * (channle.ChannlesRate - platformRate.Rate) / 100 * channle.ChannlesRakeRate / 100
};
await CreateLifePayOrder(orderInput);
@@ -970,12 +1134,10 @@
CheckExtensions.IfTrueThrowUserFriendlyException(channle == null, "娓犻亾涓嶅瓨鍦�");
CheckExtensions.IfTrueThrowUserFriendlyException(channle.Status == LifePayChannelsStatsEnum.绂佺敤, "娓犻亾宸茶绂佺敤");
- //var rate = await GetRate();
- //CheckExtensions.IfTrueThrowUserFriendlyException(rate.IsNullOrEmpty(), "鏈厤缃姌鎵�");
var repeatOrder = await _lifePayOrderRepository.Where(x => x.LifePayOrderType == LifePayOrderTypeEnum.ElectricOrder && x.PayStatus == LifePayStatusEnum.宸叉敮浠�
&& x.LifePayOrderStatus == LifePayOrderStatusEnum.鍏呭�间腑 && x.OrderParamDetailJsonStr.Contains(input.ProductData.ElectricType)
- && x.OrderParamDetailJsonStr.Contains(input.ProductData.ElectricAccount)).ToListAsync();
- CheckExtensions.IfTrueThrowUserFriendlyException(repeatOrder.Count() > 0, "鎮ㄦ湁鍚屾埛鍙疯鍗曟鍦ㄥ厖鍊间腑锛岃鍕块噸澶嶅厖鍊�");
+ && x.OrderParamDetailJsonStr.Contains(input.ProductData.ElectricAccount)).AnyAsync();
+ CheckExtensions.IfTrueThrowUserFriendlyException(repeatOrder, "鎮ㄦ湁鍚屾埛鍙疯鍗曟鍦ㄥ厖鍊间腑锛岃鍕块噸澶嶅厖鍊�");
var rate = await GetLifePayRate(channle, LifePayRateTypeEnum.榛樿鐢佃垂鎶樻墸);
@@ -987,7 +1149,6 @@
OrderNo = channle.ChannlesNum + CreateOrderNo(),
LifePayOrderStatus = LifePayOrderStatusEnum.鍏呭�间腑,
LifePayOrderType = LifePayOrderTypeEnum.ElectricOrder,
- // LifePayType = input.LifePayType,
OrderParamDetailJsonStr = JsonConvert.SerializeObject(input.ProductData),
UserId = user.Id,
PayStatus = LifePayStatusEnum.鏈敮浠�,
@@ -997,6 +1158,7 @@
RechargeAmount = amount.RechargeAmount,
ChannelId = channle.ChannlesNum,
PlatformRate = platformRate.Rate,
+ PlatformDeductionAmount = amount.RechargeAmount * platformRate.Rate / 100,
ChannleRate = rate,
ChannlesRakeRate = channle.ChannlesRakeRate,
};
@@ -1024,12 +1186,10 @@
CheckExtensions.IfTrueThrowUserFriendlyException(channle == null, "娓犻亾涓嶅瓨鍦�");
CheckExtensions.IfTrueThrowUserFriendlyException(channle.Status == LifePayChannelsStatsEnum.绂佺敤, "娓犻亾宸茶绂佺敤");
- //var rate = await GetRate();
- //CheckExtensions.IfTrueThrowUserFriendlyException(rate.IsNullOrEmpty(), "鏈厤缃姌鎵�");
var repeatOrder = await _lifePayOrderRepository.Where(x => x.LifePayOrderType == LifePayOrderTypeEnum.GasOrder && x.PayStatus == LifePayStatusEnum.宸叉敮浠�
&& x.LifePayOrderStatus == LifePayOrderStatusEnum.鍏呭�间腑 && x.OrderParamDetailJsonStr.Contains(input.ProductData.GasOrgType)
- && x.OrderParamDetailJsonStr.Contains(input.ProductData.GasAccount)).ToListAsync();
- CheckExtensions.IfTrueThrowUserFriendlyException(repeatOrder.Count() > 0, "鎮ㄦ湁鍚屾埛鍙疯鍗曟鍦ㄥ厖鍊间腑锛岃鍕块噸澶嶅厖鍊�");
+ && x.OrderParamDetailJsonStr.Contains(input.ProductData.GasAccount)).AnyAsync();
+ CheckExtensions.IfTrueThrowUserFriendlyException(repeatOrder, "鎮ㄦ湁鍚屾埛鍙疯鍗曟鍦ㄥ厖鍊间腑锛岃鍕块噸澶嶅厖鍊�");
var rate = await GetLifePayRate(channle, LifePayRateTypeEnum.榛樿鐕冩皵鎶樻墸);
@@ -1053,6 +1213,7 @@
RechargeAmount = amount.RechargeAmount,
ChannelId = channle.ChannlesNum,
PlatformRate = platformRate.Rate,
+ PlatformDeductionAmount = amount.RechargeAmount * platformRate.Rate / 100,
ChannleRate = rate,
ChannlesRakeRate = channle.ChannlesRakeRate,
};
@@ -1112,7 +1273,6 @@
CheckExtensions.IfTrueThrowUserFriendlyException(order.ACOOLYStatus != ACOOLYStatusEnum.閮ㄥ垎鍏呭�兼垚鍔�, "璇ヨ鍗曟棤娉曚慨鏀瑰埌璐﹂噾棰�");
order.ActualReceivedAmount = input.ActualReceivedAmount;
-
await _lifePayOrderRepository.UpdateAsync(order);
return Constant.SUCCESS;
@@ -1176,11 +1336,7 @@
OutOrderNo = orderNo
};
var result = await _aCOOLYManager.ConfirmElectricOrder(requestInput);
-#if DEBUG
-
_logger.LogInformation($"CreateACOOLYElectricOrder:{JsonConvert.SerializeObject(result)}");
-
-#endif
CheckExtensions.IfTrueThrowUserFriendlyException(!result.Success || (result.Code != ACOOLYConstant.Code.SUCCESS && result.Code != ACOOLYConstant.Code.PROCESSING),
result.Message);
@@ -1290,9 +1446,10 @@
public async Task LifePaySuccessHandler(string orderNo, string outOrderNo)
{
var order = await _lifePayOrderRepository.Where(x => x.OrderNo == orderNo).FirstOrDefaultAsync();
+ _logger.LogInformation($"姝ｅ湪澶勭悊璁㈠崟锛歿order?.Id}-{order?.PayStatus}");
CheckExtensions.IfTrueThrowUserFriendlyException(order == null, "璁㈠崟涓嶅瓨鍦�");
- if (order.PayStatus == LifePayStatusEnum.宸叉敮浠�)
+ if (order.PayStatus != LifePayStatusEnum.鏈敮浠�)
{
return;
}
@@ -1300,6 +1457,7 @@
order.PayStatus = LifePayStatusEnum.宸叉敮浠�;
order.PayTime = DateTime.Now;
order.OutOrderNo = outOrderNo;
+
try
{
var result = (Code: "Fail", RequestNo: "", ACOOLYOrderNo: "");
@@ -1317,22 +1475,32 @@
default:
break;
}
+ _logger.LogInformation("宸插悜渚涘簲鍟嗗彂璧疯鍗�");
order.LifePayRefundStatus = LifePayRefundStatusEnum.鏃犻渶閫�娆�;
order.LifePayOrderStatus = LifePayOrderStatusEnum.鍏呭�间腑;
//SetOrderStatus(order, result.Code);
order.OutRequestNo = result.RequestNo.IsNullOrEmpty() ? null : result.RequestNo;
order.ACOOLYOrderNo = result.ACOOLYOrderNo;
+ order.ACOOLYStatus = ACOOLYStatusEnum.鍏呭�间腑;
+ await _lifePayOrderRepository.UpdateAsync(order);
+ _logger.LogInformation("鐢熸椿缂磋垂璁㈠崟锛�" + order.ToJson());
+
+ /// 鍒涘缓鐢熸椿缂磋垂娑堣垂璁板綍
+ await _lifePayOrderService.CreatLifePayConsumption(ACOOLYStatusEnum.鍏呭�间腑, order.OrderNo, order.ACOOLYOrderNo,
+ order.PlatformDeductionAmount ?? 0, order.ChannelId, order.CreationTime, order.FinishTime);
+ _logger.LogInformation("宸叉彃鍏ユ秷璐硅褰�");
}
catch (Exception ex)
{
_logger.LogError(ex, "澶勭悊鐢熸椿缂磋垂鏀粯鎴愬姛鍥炶皟鏃跺紓甯�");
order.LifePayOrderStatus = LifePayOrderStatusEnum.寰呴��娆�;
order.LifePayRefundStatus = LifePayRefundStatusEnum.寰呴��娆�;
+ order.ACOOLYStatus = ACOOLYStatusEnum.鍏呭�煎け璐�;
order.RefundApplyRemark = ex.Message;
+ await _lifePayOrderRepository.UpdateAsync(order);
+ _logger.LogError("鐢熸椿缂磋垂璁㈠崟鐘舵�侊細" + order.LifePayOrderStatus.ToString());
}
- _logger.LogError("鐢熸椿缂磋垂璁㈠崟鐘舵�侊細" + order.LifePayOrderStatus.ToString());
- await _lifePayOrderRepository.UpdateAsync(order);
}
public async Task LifePayRefundsHandler(string orderNo, LifePayRefundStatusEnum refundStatus)
@@ -1344,10 +1512,11 @@
{
case LifePayRefundStatusEnum.宸查��娆�:
order.LifePayOrderStatus = LifePayOrderStatusEnum.宸查��娆�;
- order.ACOOLYStatus = ACOOLYStatusEnum.宸查��娆�;
+ order.LifePayRefundStatus = LifePayRefundStatusEnum.宸查��娆�;
break;
case LifePayRefundStatusEnum.閫�娆句腑:
order.LifePayOrderStatus = LifePayOrderStatusEnum.閫�娆句腑;
+ order.LifePayRefundStatus = LifePayRefundStatusEnum.閫�娆句腑;
break;
default: break;
}
@@ -1360,17 +1529,29 @@
/// <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.宸插畬鎴�)
+ await using var orderLock = await distributedLock.TryAcquireAsync($"LockKey:UpdateOrder:{orderNo}", TimeSpan.FromSeconds(60));
+
+ if (order.ACOOLYStatus.HasValue && (int)order.ACOOLYStatus > (int)acoolyStatus)
{
+ _logger.LogInformation($"璁㈠崟锛坽orderNo}锛夌敱{order.ACOOLYStatus}鑷硔acoolyStatus}澶辫触锛屼笉鍙洖婊氱姸鎬�");
return;
}
- order.PlatformDeductionAmount = payAmount;
+ if (order.LifePayOrderStatus == status && order.ACOOLYStatus == acoolyStatus)
+ {
+ _logger.LogInformation($"璁㈠崟锛坽orderNo}锛夊凡澶勭悊璇ョ姸鎬�");
+ return;
+ }
+
+ order.ActualReceivedAmount = actualParValue;
+ order.PlatformDeductionAmount = Math.Round((order.ActualReceivedAmount ?? 0) * (order.PlatformRate ?? 0) / 100, 2);
+
if (acoolyOrderNo.IsNotNullOrEmpty())
{
order.ACOOLYOrderNo = acoolyOrderNo;
@@ -1388,11 +1569,23 @@
order.LifePayOrderStatus = status;
order.ACOOLYStatus = acoolyStatus;
- order.FinishTime = DateTime.Now;
+
+ if (order.LifePayOrderStatus == LifePayOrderStatusEnum.宸插畬鎴�
+ || order.LifePayOrderStatus == LifePayOrderStatusEnum.宸查��娆�)
+ {
+ order.FinishTime = DateTime.Now;
+ }
+
+ if (order.ACOOLYStatus == ACOOLYStatusEnum.宸查��娆� || order.ACOOLYStatus == ACOOLYStatusEnum.閮ㄥ垎鍏呭�兼垚鍔�)
+ {
+ order.RefundPrice = Math.Round((1 - ((order.ActualReceivedAmount ?? 0) / (order.RechargeAmount ?? 0))) * (order.PayAmount ?? 0), 2);
+ }
+
await _lifePayOrderRepository.UpdateAsync(order);
if (order.LifePayOrderStatus == LifePayOrderStatusEnum.宸插畬鎴�)
{
+ ///缁撶畻娓犻亾浣ｉ噾
/// 姣涘埄
var grossProfit = order.RechargeAmount * (order.ChannleRate - order.PlatformRate) / 100;
/// 娓犻亾浣ｉ噾 锛�(鍏呭�奸潰棰� * 娓犻亾鎶樻墸姣斾緥)-(鍏呭�奸潰棰� * 骞冲彴鎶樻墸姣斾緥)锛�* 浣ｉ噾姣斾緥
@@ -1402,15 +1595,19 @@
LifePayChannlesRake lifePayChannlesRake = new LifePayChannlesRake()
{
OrderNo = order.OrderNo,
- PayAmount = order.PayAmount.Value,
- ChannlesRakeRate = order.ChannlesRakeRate.Value,
- ChannlesRakePrice = channlesRakePrice.Value,
+ PayAmount = order.RechargeAmount ?? 0,
+ ChannlesRakeRate = order.ChannlesRakeRate ?? 0,
+ ChannlesRakePrice = channlesRakePrice ?? 0,
FinishTime = order.FinishTime.Value,
ChannelId = order.ChannelId,
};
await _lifePayChannlesRakeRepository.InsertAsync(lifePayChannlesRake);
}
}
+
+ /// 鍒涘缓鐢熸椿缂磋垂娑堣垂璁板綍
+ await _lifePayOrderService.CreatLifePayConsumption(acoolyStatus, order.OrderNo, order.ACOOLYOrderNo,
+ order.PlatformDeductionAmount ?? 0, order.ChannelId, order.CreationTime, order.FinishTime, order.ChannleRate, parValue, actualParValue);
}
/// <summary>
@@ -1449,20 +1646,26 @@
{
case LifePayTypeEnum.WxPay:
var wxRefundResult = await WxPayDomesticRefunds(order.OrderNo, outRefundNo, order.RefundApplyRemark, Convert.ToInt32(input.RefundPrice * 100), Convert.ToInt32(order.PayAmount * 100));
- if (wxRefundResult.Status == "SUCCESS")
+ if (wxRefundResult.Status == WxpayRefundResultStatus.SUCCESS)
+ {
+ order.RefundOrderNo = outRefundNo;
+ order.LifePayOrderStatus = LifePayOrderStatusEnum.閫�娆句腑;
+ order.LifePayRefundStatus = LifePayRefundStatusEnum.閫�娆句腑;
+ }
+ else if (wxRefundResult.Status == WxpayRefundResultStatus.PROCESSING)
+ {
+ order.RefundOrderNo = outRefundNo;
+ order.LifePayOrderStatus = LifePayOrderStatusEnum.閫�娆句腑;
+ order.LifePayRefundStatus = LifePayRefundStatusEnum.閫�娆句腑;
+ }
+ else if (wxRefundResult.Status.IsNullOrEmpty() && wxRefundResult.Message == WxpayRefundResultMessage.FullRefund)
{
order.LifePayOrderStatus = LifePayOrderStatusEnum.宸查��娆�;
order.LifePayRefundStatus = LifePayRefundStatusEnum.宸查��娆�;
}
- else if (wxRefundResult.Status == "PROCESSING")
- {
- order.LifePayOrderStatus = LifePayOrderStatusEnum.閫�娆句腑;
- order.LifePayRefundStatus = LifePayRefundStatusEnum.閫�娆句腑;
- }
else
{
- order.LifePayOrderStatus = LifePayOrderStatusEnum.寰呴��娆�;
- order.LifePayRefundStatus = LifePayRefundStatusEnum.寰呴��娆�;
+ throw new UserFriendlyException("閫�娆惧け璐�:" + wxRefundResult.Message);
}
break;
@@ -1473,18 +1676,20 @@
throw new UserFriendlyException("閫�娆惧け璐�:" + aliRefundResult.SubMsg);
}
+ order.RefundOrderNo = outRefundNo;
order.LifePayOrderStatus = LifePayOrderStatusEnum.閫�娆句腑;
order.LifePayRefundStatus = LifePayRefundStatusEnum.閫�娆句腑;
break;
default: throw new UserFriendlyException("閫�娆惧け璐�");
}
- order.RefundOrderNo = outRefundNo;
order.RefundCredentialsImgUrl = input.RefundCredentialsImgUrl;
order.RefundCheckRemark = input.RefundCheckRemark;
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);
@@ -1581,9 +1786,9 @@
var userAccount = await _lifePayAccount.Where(x => x.UserId == input.UserId && x.Id == input.Id)
.FirstOrDefaultAsync();
CheckExtensions.IfTrueThrowUserFriendlyException(userAccount == null, "鎴峰彿涓嶅瓨鍦�");
- var repeatAccountContent = await _lifePayAccount.Where(x => x.UserId == input.UserId && x.LifePayType == input.LifePayType && x.Content == input.Content && x.Id != input.Id && x.IsDeleted == false)
- .FirstOrDefaultAsync();
- CheckExtensions.IfTrueThrowUserFriendlyException(repeatAccountContent != null, "鎴峰彿宸插瓨鍦�");
+ var repeatAccountContent = await _lifePayAccount.Where(x => x.UserId == input.UserId && x.LifePayType == input.LifePayType && x.Content == input.Content && x.Id != input.Id)
+ .AnyAsync();
+ CheckExtensions.IfTrueThrowUserFriendlyException(repeatAccountContent, "鎴峰彿宸插瓨鍦�");
userAccount.LifePayType = input.LifePayType;
userAccount.Content = input.Content;
@@ -1596,8 +1801,8 @@
else
{
var repeatAccountContent = await _lifePayAccount.Where(x => x.UserId == input.UserId && x.LifePayType == input.LifePayType && x.Content == input.Content && x.IsDeleted == false)
- .FirstOrDefaultAsync();
- CheckExtensions.IfTrueThrowUserFriendlyException(repeatAccountContent != null, "鎴峰彿宸插瓨鍦�");
+ .AnyAsync();
+ CheckExtensions.IfTrueThrowUserFriendlyException(repeatAccountContent, "鎴峰彿宸插瓨鍦�");
var userAccount = new LifePayAccount
{
Id = Guid.NewGuid(),
@@ -1639,6 +1844,7 @@
userAccount.DeleterId = userAccount.UserId;
userAccount.DeletionTime = DateTime.Now;
userAccount.IsDeleted = true;
+
return Constant.SUCCESS;
}
@@ -1660,21 +1866,15 @@
if (order.LifePayOrderStatus == LifePayOrderStatusEnum.寰呴��娆� || order.LifePayRefundStatus == LifePayRefundStatusEnum.寰呴��娆�)
{
- if (order.ACOOLYStatus == ACOOLYStatusEnum.宸插畬鎴� || order.ACOOLYStatus == ACOOLYStatusEnum.鍏呭�兼垚鍔� || order.ACOOLYStatus == ACOOLYStatusEnum.閮ㄥ垎鍏呭�兼垚鍔�)
- {
- order.LifePayOrderStatus = LifePayOrderStatusEnum.宸插畬鎴�;
- }
-
order.RefundCheckRemark = input.RefundCheckRemark;
order.RefundCheckUserId = CurrentUser.Id;
- order.LifePayRefundStatus = LifePayRefundStatusEnum.閫�娆鹃┏鍥�;
+ order.LifePayRefundStatus = LifePayRefundStatusEnum.寰呴��娆�;
+ order.LifePayOrderStatus = LifePayOrderStatusEnum.寰呴��娆�;
await _lifePayOrderRepository.UpdateAsync(order);
#region 璁板綍鏃ュ織
-
- await PublishLifePayOrderHistoryEvent("閫�娆鹃┏鍥�", "閫�娆�", order.Id);
-
+ await LifePayOrderHistory("閫�娆鹃┏鍥�", "閫�娆鹃┏鍥�", order.Id, (int)OperateHistoryTypeEnum.LifePayRefund);
#endregion
}
else
@@ -1691,13 +1891,26 @@
{
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;
+ }
+
+ var rate = await _lifePayRateRepository.FirstOrDefaultAsync(it => it.RateType == LifePayRateTypeEnum.渚涘簲鍟嗘姌鎵ｄ环);
+ CheckExtensions.IfTrueThrowUserFriendlyException(rate != null && input.ChannlesRate < rate.Rate, "娓犻亾鎶樻墸鏃犳硶浣庝簬渚涘簲鍟嗘姌鎵�");
+
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);
@@ -1709,6 +1922,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 璁板綍鏃ュ織
@@ -2101,6 +2321,7 @@
PlatformDeductionAmount = a.PlatformDeductionAmount,
ACOOLYStatus = a.ACOOLYStatus,
LifePayRefundStatus = a.LifePayRefundStatus,
+ OrderParamDetailJsonStr = a.OrderParamDetailJsonStr
});
@@ -2158,20 +2379,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,
@@ -2190,7 +2419,7 @@
var channlesRakePrice = grossProfit * (channlesRakeRate) / 100;
/// 鍒╂鼎
- var profit = grossProfit - channlesRakePrice - (premiumRate);
+ var profit = grossProfit - channlesRakePrice - premiumPrice;
return new OrderPriceReturn()
{
@@ -2224,7 +2453,7 @@
CheckExtensions.IfTrueThrowUserFriendlyException(order.LifePayType.HasValue, "褰撳墠璁㈠崟宸查�夋嫨鏀粯绫诲瀷");
order.LifePayType = lifePayType;
- var premium = await _lifePayPremiumRepository.Where(x => x.IsDeleted == false && x.PremiumType == order.LifePayType).FirstOrDefaultAsync();
+ var premium = await _lifePayPremiumRepository.Where(x => x.PremiumType == order.LifePayType).FirstOrDefaultAsync();
order.PremiumRate = premium == null ? 0 : premium.Rate;
await _lifePayOrderRepository.UpdateAsync(order);
@@ -2243,12 +2472,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