From 72f1ffc5e93c1b430a153a906d91913127ce58d8 Mon Sep 17 00:00:00 2001
From: zhengyuxuan <zhengyuxuan1995>
Date: 星期五, 28 三月 2025 10:20:30 +0800
Subject: [PATCH] 合并
---
LifePayment/LifePayment.Domain.Shared/Enum/LifePay/LifePayEnum.cs | 6 +-
LifePayment/LifePayment.Application/LifePay/LifePayService.cs | 169 +++++++++++++++++++++-----------------------------------
2 files changed, 66 insertions(+), 109 deletions(-)
diff --git a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
index cb51b66..88486e5 100644
--- a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
+++ b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
@@ -887,7 +887,7 @@
{
OrderNo = channle.ChannlesNum + CreateOrderNo(),
LifePayOrderStatus = LifePayOrderStatusEnum.鍏呭�间腑,
- LifePayOrderType = LifePayOrderTypeEnum.璇濊垂璁㈠崟,
+ LifePayOrderType = LifePayOrderTypeEnum.PhoneOrder,
//LifePayType = input.LifePayType,
OrderParamDetailJsonStr = JsonConvert.SerializeObject(input.ProductData),
UserId = user.Id,
@@ -930,21 +930,20 @@
//var rate = await GetRate();
//CheckExtensions.IfTrueThrowUserFriendlyException(rate.IsNullOrEmpty(), "鏈厤缃姌鎵�");
var repeatOrder = await _lifePayOrderRepository.Where(x => x.LifePayOrderType == LifePayOrderTypeEnum.鐢佃垂璁㈠崟 && x.PayStatus == LifePayStatusEnum.宸叉敮浠�
- && x.LifePayOrderStatus == LifePayOrderStatusEnum.鍏呭�间腑
+ && x.LifePayOrderStatus == LifePayOrderStatusEnum.鍏呭�间腑 && x.OrderParamDetailJsonStr.Contains(input.ProductData.ElectricType)
&& x.OrderParamDetailJsonStr.Contains(input.ProductData.ElectricAccount)).ToListAsync();
CheckExtensions.IfTrueThrowUserFriendlyException(repeatOrder.Count() > 0, "鎮ㄦ湁鍚屾埛鍙疯鍗曟鍦ㄥ厖鍊间腑锛岃鍕块噸澶嶅厖鍊�");
+
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
{
OrderNo = channle.ChannlesNum + CreateOrderNo(),
LifePayOrderStatus = LifePayOrderStatusEnum.鍏呭�间腑,
- LifePayOrderType = LifePayOrderTypeEnum.鐢佃垂璁㈠崟,
+ LifePayOrderType = LifePayOrderTypeEnum.ElectricOrder,
// LifePayType = input.LifePayType,
OrderParamDetailJsonStr = JsonConvert.SerializeObject(input.ProductData),
UserId = user.Id,
@@ -985,7 +984,7 @@
//var rate = await GetRate();
//CheckExtensions.IfTrueThrowUserFriendlyException(rate.IsNullOrEmpty(), "鏈厤缃姌鎵�");
var repeatOrder = await _lifePayOrderRepository.Where(x => x.LifePayOrderType == LifePayOrderTypeEnum.鐕冩皵璁㈠崟 && x.PayStatus == LifePayStatusEnum.宸叉敮浠�
- && x.LifePayOrderStatus == LifePayOrderStatusEnum.鍏呭�间腑
+ && x.LifePayOrderStatus == LifePayOrderStatusEnum.鍏呭�间腑 && x.OrderParamDetailJsonStr.Contains(input.ProductData.GasOrgType)
&& x.OrderParamDetailJsonStr.Contains(input.ProductData.GasAccount)).ToListAsync();
CheckExtensions.IfTrueThrowUserFriendlyException(repeatOrder.Count() > 0, "鎮ㄦ湁鍚屾埛鍙疯鍗曟鍦ㄥ厖鍊间腑锛岃鍕块噸澶嶅厖鍊�");
@@ -1000,7 +999,7 @@
{
OrderNo = channle.ChannlesNum + CreateOrderNo(),
LifePayOrderStatus = LifePayOrderStatusEnum.鍏呭�间腑,
- LifePayOrderType = LifePayOrderTypeEnum.鐕冩皵璁㈠崟,
+ LifePayOrderType = LifePayOrderTypeEnum.GasOrder,
// LifePayType = input.LifePayType,
OrderParamDetailJsonStr = JsonConvert.SerializeObject(input.ProductData),
UserId = user.Id,
@@ -1031,35 +1030,12 @@
/// <returns></returns>
public async Task<string> SetLifePayOrderPayType(SetLifePayOrderPayTypeInput input, string ip)
{
- var order = await _lifePayOrderRepository.Where(x => x.OrderNo == input.OrderNo).FirstOrDefaultAsync();
- CheckExtensions.IfTrueThrowUserFriendlyException(order == null, "璁㈠崟涓嶅瓨鍦�");
- CheckExtensions.IfTrueThrowUserFriendlyException(order.LifePayType.HasValue, "褰撳墠璁㈠崟宸查�夋嫨鏀粯绫诲瀷");
-
- order.LifePayType = input.LifePayType;
- var premium = await _lifePayPremiumRepository.Where(x => x.IsDeleted == false && x.PremiumType == order.LifePayType).FirstOrDefaultAsync();
- order.PremiumRate = premium == null ? 0 : premium.Rate;
- await _lifePayOrderRepository.UpdateAsync(order);
-
- var desc = "鐢熸椿缂磋垂-";
- switch (order.LifePayOrderType)
- {
- case LifePayOrderTypeEnum.璇濊垂璁㈠崟:
- desc += "璇濊垂";
- break;
- case LifePayOrderTypeEnum.鐢佃垂璁㈠崟:
- desc += "鐢佃垂";
- break;
- case LifePayOrderTypeEnum.鐕冩皵璁㈠崟:
- desc += "鐕冩皵";
- break;
- default:
- break;
- }
+ var res = await SetPayType(input.OrderNo, input.LifePayType, ip);
#if DEBUG
//var payUrl = await GetPayQRCode(order.LifePayType.Value, order.OrderNo, desc, 0.01m, ip, input.H5Type);
- var payUrl = await GetPayQRCode(order.LifePayType.Value, order.OrderNo, desc, order.PayAmount ?? 0, ip, input.H5Type);
+ var payUrl = await GetPayQRCode(res.LifePayType, res.OrderNo, res.Desc, res.PayAmount, ip, input.H5Type);
#else
//var payUrl = await GetPayQRCode(order.LifePayType.Value, order.OrderNo, desc, 0.01m, ip, input.H5Type);
var payUrl = await GetPayQRCode(order.LifePayType.Value, order.OrderNo, desc, order.PayAmount??0, ip, input.H5Type);
@@ -1075,43 +1051,9 @@
/// <returns></returns>
public async Task<ModelPaymentMiniPay> GetPayOrderForJsAPI(GetPayOrderForJsAPIInput input, string ip)
{
- var order = await _lifePayOrderRepository.Where(x => x.OrderNo == input.OrderNo).FirstOrDefaultAsync();
- CheckExtensions.IfTrueThrowUserFriendlyException(order == null, "璁㈠崟涓嶅瓨鍦�");
-
- CheckExtensions.IfTrueThrowUserFriendlyException(order.LifePayType.HasValue, "褰撳墠璁㈠崟宸查�夋嫨鏀粯绫诲瀷");
-
- order.LifePayType = input.LifePayType;
- var premium = await _lifePayPremiumRepository.Where(x => x.IsDeleted == false && x.PremiumType == order.LifePayType).FirstOrDefaultAsync();
- order.PremiumRate = premium == null ? 0 : premium.Rate;
- await _lifePayOrderRepository.UpdateAsync(order);
-
- var desc = "鐢熸椿缂磋垂-";
- switch (order.LifePayOrderType)
- {
- case LifePayOrderTypeEnum.璇濊垂璁㈠崟:
- desc += "璇濊垂";
- break;
- case LifePayOrderTypeEnum.鐢佃垂璁㈠崟:
- desc += "鐢佃垂";
- break;
- case LifePayOrderTypeEnum.鐕冩皵璁㈠崟:
- desc += "鐕冩皵";
- break;
- default:
- break;
- }
-
-
- //var result = await PayTransactionsJsAPI(input.OpenId, input.Attach, 0.01m, input.OrderNo, desc);
- //return result;
-
- // var result = await PayTransactionsJsAPI(input.OpenId, input.Attach, order.PayAmount, input.OrderNo, desc);
-
- var result = await PayTransactionsJsAPI(input.OpenId, input.PayAppId, input.Attach, order.PayAmount ?? 0, input.OrderNo, desc);
+ var res = await SetPayType(input.OrderNo, input.LifePayType, ip);
+ var result = await PayTransactionsJsAPI(input.OpenId, input.PayAppId, input.Attach, res.PayAmount, input.OrderNo, res.Desc);
return result;
- //var payUrl = await GetPayQRCode(order.LifePayType.Value, order.OrderNo, desc, 0.01m, ip, input.H5Type);
- //var payUrl = await GetPayQRCode(order.LifePayType.Value, order.OrderNo, desc, order.PayAmount, ip, input.H5Type);
-
}
/// <summary>
@@ -1140,8 +1082,6 @@
/// <returns></returns>
public async Task CreateLifePayOrder(CreateLifePayOrderInput input)
{
- CheckExtensions.IfTrueThrowUserFriendlyException(input.RechargeAmount < 0.01m || input.PayAmount < 0.01m || input.DiscountAmount < 0, "璁㈠崟閲戦閿欒");
-
var entity = ObjectMapper.Map<CreateLifePayOrderInput, LifePayOrder>(input);
await _lifePayOrderRepository.InsertAsync(entity);
}
@@ -1322,13 +1262,13 @@
var result = (Code: "Fail", RequestNo: "", ACOOLYOrderNo: "");
switch (order.LifePayOrderType)
{
- case LifePayOrderTypeEnum.璇濊垂璁㈠崟:
+ case LifePayOrderTypeEnum.PhoneOrder:
result = await CreateACOOLYPhoneOrder(JsonConvert.DeserializeObject<LifePhoneData>(order.OrderParamDetailJsonStr), order.OrderNo);
break;
- case LifePayOrderTypeEnum.鐢佃垂璁㈠崟:
+ case LifePayOrderTypeEnum.ElectricOrder:
result = await CreateACOOLYElectricOrder(JsonConvert.DeserializeObject<LifeElectricData>(order.OrderParamDetailJsonStr), order.OrderNo);
break;
- case LifePayOrderTypeEnum.鐕冩皵璁㈠崟:
+ case LifePayOrderTypeEnum.GasOrder:
result = await CreateACOOLYGasOrder(JsonConvert.DeserializeObject<LifeGasData>(order.OrderParamDetailJsonStr), order.OrderNo);
break;
default:
@@ -1339,7 +1279,7 @@
order.LifePayOrderStatus = LifePayOrderStatusEnum.鍏呭�间腑;
//SetOrderStatus(order, result.Code);
order.OutRequestNo = result.RequestNo.IsNullOrEmpty() ? null : result.RequestNo;
- order.ACOOLYOrderNo = result.ACOOLYOrderNo.IsNullOrEmpty() ? null : result.ACOOLYOrderNo;
+ order.ACOOLYOrderNo = result.ACOOLYOrderNo;
}
catch (Exception ex)
{
@@ -1454,11 +1394,6 @@
{
order.LifePayOrderStatus = LifePayOrderStatusEnum.閫�娆句腑;
order.LifePayRefundStatus = LifePayRefundStatusEnum.閫�娆句腑;
- }
- else if (wxRefundResult.Message == "璁㈠崟宸插叏棰濋��娆�")
- {
- order.LifePayOrderStatus = LifePayOrderStatusEnum.宸查��娆�;
- order.LifePayRefundStatus = LifePayRefundStatusEnum.宸查��娆�;
}
else
{
@@ -1597,34 +1532,20 @@
{
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, "鎴峰彿宸插瓨鍦�");
- if (repeatAccountContent != null)
+ CheckExtensions.IfTrueThrowUserFriendlyException(repeatAccountContent != null, "鎴峰彿宸插瓨鍦�");
+ var userAccount = new LifePayAccount
{
- repeatAccountContent.LifePayType = input.LifePayType;
- repeatAccountContent.Content = input.Content;
- repeatAccountContent.Province = input.Province;
- repeatAccountContent.City = input.City;
- repeatAccountContent.Remark = input.Remark;
- repeatAccountContent.Operators = input.Operators;
- repeatAccountContent.ExtraProperties = input.ExtraProperties;
- }
- else
- {
- var userAccount = new LifePayAccount
- {
- Id = Guid.NewGuid(),
- UserId = input.UserId,
- Content = input.Content,
- Province = input.Province,
- LifePayType = input.LifePayType,
- City = input.City,
- Remark = input.Remark,
- Operators = input.Operators,
- ExtraProperties = input.ExtraProperties,
- };
- await _lifePayAccount.InsertAsync(userAccount);
- }
-
+ Id = Guid.NewGuid(),
+ UserId = input.UserId,
+ Content = input.Content,
+ Province = input.Province,
+ LifePayType = input.LifePayType,
+ City = input.City,
+ Remark = input.Remark,
+ Operators = input.Operators,
+ ExtraProperties = input.ExtraProperties,
+ };
+ await _lifePayAccount.InsertAsync(userAccount);
}
if (input.LifePayType == LifePayOrderTypeEnum.璇濊垂璁㈠崟)
@@ -2230,6 +2151,42 @@
return channel.ChannlesRate;
}
}
+ public async Task<SetPayTypeReturn> SetPayType(string orderNo, LifePayTypeEnum lifePayType, string ip)
+ {
+ var order = await _lifePayOrderRepository.Where(x => x.OrderNo == orderNo).FirstOrDefaultAsync();
+ CheckExtensions.IfTrueThrowUserFriendlyException(order == null, "璁㈠崟涓嶅瓨鍦�");
+
+ CheckExtensions.IfTrueThrowUserFriendlyException(order.LifePayType.HasValue, "褰撳墠璁㈠崟宸查�夋嫨鏀粯绫诲瀷");
+
+ order.LifePayType = lifePayType;
+ var premium = await _lifePayPremiumRepository.Where(x => x.IsDeleted == false && x.PremiumType == order.LifePayType).FirstOrDefaultAsync();
+ order.PremiumRate = premium == null ? 0 : premium.Rate;
+ await _lifePayOrderRepository.UpdateAsync(order);
+
+ var desc = "鐢熸椿缂磋垂-";
+ switch (order.LifePayOrderType)
+ {
+ case LifePayOrderTypeEnum.PhoneOrder:
+ desc += "璇濊垂";
+ break;
+ case LifePayOrderTypeEnum.ElectricOrder:
+ desc += "鐢佃垂";
+ break;
+ case LifePayOrderTypeEnum.GasOrder:
+ desc += "鐕冩皵";
+ break;
+ default:
+ break;
+ }
+
+ return new SetPayTypeReturn()
+ {
+ Desc = desc,
+ OrderNo = order.OrderNo,
+ PayAmount = order.PayAmount.HasValue? order.PayAmount.Value : 0,
+ LifePayType = lifePayType,
+ };
+ }
#endregion
}
diff --git a/LifePayment/LifePayment.Domain.Shared/Enum/LifePay/LifePayEnum.cs b/LifePayment/LifePayment.Domain.Shared/Enum/LifePay/LifePayEnum.cs
index 3acbb10..fa91acf 100644
--- a/LifePayment/LifePayment.Domain.Shared/Enum/LifePay/LifePayEnum.cs
+++ b/LifePayment/LifePayment.Domain.Shared/Enum/LifePay/LifePayEnum.cs
@@ -14,13 +14,13 @@
public enum LifePayOrderTypeEnum
{
[Description("璇濊垂璁㈠崟")]
- 璇濊垂璁㈠崟 = 10,
+ PhoneOrder = 10,
[Description("鐢佃垂璁㈠崟")]
- 鐢佃垂璁㈠崟 = 20,
+ ElectricOrder = 20,
[Description("鐕冩皵璁㈠崟")]
- 鐕冩皵璁㈠崟 = 30,
+ GasOrder = 30,
}
public enum LifePayStatusEnum
--
Gitblit v1.9.1