From e80d0c59be1dd43fa5ce8c89ebc57764f091b2ae Mon Sep 17 00:00:00 2001
From: zhengyuxuan <zhengyuxuan1995>
Date: 星期一, 31 三月 2025 18:36:34 +0800
Subject: [PATCH] fix:退款bug
---
LifePayment/LifePayment.Application/LifePay/LifePayService.cs | 287 +++++++++++++++++++++++++++++++++------------------------
1 files changed, 167 insertions(+), 120 deletions(-)
diff --git a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
index 544d13e..472ffdb 100644
--- a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
+++ b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
@@ -28,6 +28,8 @@
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;
@@ -45,6 +47,8 @@
private readonly IRepository<LifePayChannles, Guid> _lifePayChannlesRep;
private readonly IRepository<LifePayAccount, Guid> _lifePayAccount;
private readonly IRepository<OperateHistory, Guid> _operateHistory;
+ private readonly IRepository<LifePayChannlesRake, Guid> _lifePayChannlesRakeRepository;
+ private readonly ILifePayOrderService _lifePayOrderService;
private readonly IDataFilter dataFilter;
private readonly IChannelFilter _channelFilter;
private readonly IAliPayApi _aliPayApi;
@@ -63,7 +67,9 @@
IRepository<LifePayUser, Guid> lifePayUserRepository,
IRepository<LifePayPremium, Guid> lifePayPremiumRepository,
IRepository<LifePayIntroInfo, Guid> lifePayIntroInfoRepository,
+ IRepository<LifePayChannlesRake, Guid> lifePayChannlesRakeRepository,
IRepository<OperateHistory, Guid> operateHistory,
+ ILifePayOrderService lifePayOrderService,
IAliPayApi aliPayApi,
IAlipayInterfaceManager aliPayInterfaceManager,
IWxPayApi wxPayApi,
@@ -79,9 +85,11 @@
_lifePayRateRepository = lifePayRateRepository;
_lifePayOrderRepository = lifePayOrderRepository;
_lifePayUserRepository = lifePayUserRepository;
+ _lifePayChannlesRakeRepository = lifePayChannlesRakeRepository;
_lifePayPremiumRepository = lifePayPremiumRepository;
_lifePayIntroInfoRepository = lifePayIntroInfoRepository;
_aliPayApi = aliPayApi;
+ _lifePayOrderService = lifePayOrderService;
_alipayInterfaceManager = aliPayInterfaceManager;
_wxPayApi = wxPayApi;
_wxPayOptions = wxPayOptions.Value;
@@ -820,6 +828,66 @@
return "";
}
}
+
+ /// <summary>
+ /// 鏌ヨ鏀粯瀹濇敮浠樿鍗曚俊鎭�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ public async Task<AlipayTradeQueryResponse> QueryAlipayTrade(OrderInQuiryInput input)
+ {
+ var result = await _aliPayApi.OrderInQuiry(input);
+
+ return result;
+ }
+
+ /// <summary>
+ /// 鏌ヨ鏀粯瀹濋��娆捐鍗曚俊鎭�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ public async Task<AlipayTradeFastpayRefundQueryResponse> QueryAlipayTradeRefund(OrderInQuiryInput input)
+ {
+ var result = await _aliPayApi.QueryAlipayTradeRefund(input);
+ var order = await _lifePayOrderRepository.Where(x => x.OrderNo == input.OutTradeNo).FirstOrDefaultAsync();
+ if (result.Code == AlipayResultCode.Success && result.RefundStatus == AlipayRefundStatus.Success)
+ {
+ order.LifePayOrderStatus = LifePayOrderStatusEnum.宸查��娆�;
+ order.LifePayRefundStatus = LifePayRefundStatusEnum.宸查��娆�;
+ await _lifePayOrderService.AddLifePayExpensesReceipts(new AddLifePayExpensesReceiptsInput()
+ {
+ OrderNo = result.OutTradeNo,
+ OutOrderNo = result.TradeNo,
+ LifePayType = LifePayTypeEnum.AliPay,
+ ExpensesReceiptsType = ExpensesReceiptsTypeEnum.Receipts
+ });
+ }
+
+ return result;
+ }
+
+ /// <summary>
+ /// 鏌ヨ寰俊閫�娆捐鍗曚俊鎭�
+ /// </summary>
+ /// <param name="outTradeNo"></param>
+ /// <returns></returns>
+ public async Task<WxPayDomesticRefundsQueryReponse> WxPayDomesticRefundsQuery(string outTradeNo)
+ {
+ return await _wxPayApi.WxPayDomesticRefundsQuery(outTradeNo);
+ }
+
+ /// <summary>
+ /// 鏌ヨ寰俊璁㈠崟淇℃伅
+ /// </summary>
+ /// <param name="outTradeNo"></param>
+ /// <returns></returns>
+ public async Task<WxPayTradeQueryReponse> WxPayTradeQuery(string outTradeNo)
+ {
+ return await _wxPayApi.WxPayTradeQuery(outTradeNo);
+ }
+
+
+
#endregion
#region 鎿嶄綔
@@ -840,8 +908,8 @@
var channle = await GetLifePayChannlesDtoByNum(input.ChannelId);
CheckExtensions.IfTrueThrowUserFriendlyException(channle == null, "娓犻亾涓嶅瓨鍦�");
- var repeatOrder = await _lifePayOrderRepository.Where(x => x.LifePayOrderType == LifePayOrderTypeEnum.璇濊垂璁㈠崟 && x.PayStatus == LifePayStatusEnum.宸叉敮浠�
- && x.LifePayOrderStatus == LifePayOrderStatusEnum.鍏呭�间腑 && x.OrderParamDetailJsonStr.Contains(input.ProductData.IspCode)
+ 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, "鎮ㄦ湁鍚屾埛鍙疯鍗曟鍦ㄥ厖鍊间腑锛岃鍕块噸澶嶅厖鍊�");
@@ -859,7 +927,7 @@
{
OrderNo = channle.ChannlesNum + CreateOrderNo(),
LifePayOrderStatus = LifePayOrderStatusEnum.鍏呭�间腑,
- LifePayOrderType = LifePayOrderTypeEnum.璇濊垂璁㈠崟,
+ LifePayOrderType = LifePayOrderTypeEnum.PhoneOrder,
//LifePayType = input.LifePayType,
OrderParamDetailJsonStr = JsonConvert.SerializeObject(input.ProductData),
UserId = user.Id,
@@ -901,22 +969,21 @@
//var rate = await GetRate();
//CheckExtensions.IfTrueThrowUserFriendlyException(rate.IsNullOrEmpty(), "鏈厤缃姌鎵�");
- var repeatOrder = await _lifePayOrderRepository.Where(x => x.LifePayOrderType == LifePayOrderTypeEnum.鐢佃垂璁㈠崟 && x.PayStatus == LifePayStatusEnum.宸叉敮浠�
+ 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, "鎮ㄦ湁鍚屾埛鍙疯鍗曟鍦ㄥ厖鍊间腑锛岃鍕块噸澶嶅厖鍊�");
+ 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,
@@ -956,7 +1023,7 @@
//var rate = await GetRate();
//CheckExtensions.IfTrueThrowUserFriendlyException(rate.IsNullOrEmpty(), "鏈厤缃姌鎵�");
- var repeatOrder = await _lifePayOrderRepository.Where(x => x.LifePayOrderType == LifePayOrderTypeEnum.鐕冩皵璁㈠崟 && x.PayStatus == LifePayStatusEnum.宸叉敮浠�
+ 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, "鎮ㄦ湁鍚屾埛鍙疯鍗曟鍦ㄥ厖鍊间腑锛岃鍕块噸澶嶅厖鍊�");
@@ -972,7 +1039,7 @@
{
OrderNo = channle.ChannlesNum + CreateOrderNo(),
LifePayOrderStatus = LifePayOrderStatusEnum.鍏呭�间腑,
- LifePayOrderType = LifePayOrderTypeEnum.鐕冩皵璁㈠崟,
+ LifePayOrderType = LifePayOrderTypeEnum.GasOrder,
// LifePayType = input.LifePayType,
OrderParamDetailJsonStr = JsonConvert.SerializeObject(input.ProductData),
UserId = user.Id,
@@ -1003,38 +1070,15 @@
/// <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);
+ //var payUrl = await GetPayQRCode(res.LifePayType, res.OrderNo, res.Desc, 0.01m, ip, input.H5Type);
+ var payUrl = await GetPayQRCode(res.LifePayType, res.OrderNo, res.Desc, res.PayAmount, ip, input.H5Type);
#endif
return payUrl;
@@ -1047,43 +1091,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>
@@ -1112,8 +1122,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);
}
@@ -1294,13 +1302,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:
@@ -1311,7 +1319,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)
{
@@ -1324,7 +1332,7 @@
await _lifePayOrderRepository.UpdateAsync(order);
}
- public async Task WxPayDomesticRefundsHandler(string orderNo, LifePayRefundStatusEnum refundStatus)
+ public async Task LifePayRefundsHandler(string orderNo, LifePayRefundStatusEnum refundStatus)
{
var order = await _lifePayOrderRepository.Where(x => x.OrderNo == orderNo).FirstOrDefaultAsync();
CheckExtensions.IfTrueThrowUserFriendlyException(order == null, "璁㈠崟涓嶅瓨鍦�");
@@ -1342,6 +1350,7 @@
}
}
+
/// <summary>
/// ACOOLYO璁㈠崟閫氱煡澶勭悊
/// </summary>
@@ -1353,10 +1362,10 @@
var order = await _lifePayOrderRepository.Where(x => x.OrderNo == orderNo).FirstOrDefaultAsync();
CheckExtensions.IfTrueThrowUserFriendlyException(order == null, "璁㈠崟涓嶅瓨鍦�");
- //if (order.LifePayOrderStatus == LifePayOrderStatusEnum.宸插畬鎴�)
- //{
- // return;
- //}
+ if (order.LifePayOrderStatus == LifePayOrderStatusEnum.宸插畬鎴� || order.LifePayOrderStatus == LifePayOrderStatusEnum.宸查��娆�)
+ {
+ return;
+ }
order.PlatformDeductionAmount = payAmount;
if (acoolyOrderNo.IsNotNullOrEmpty())
@@ -1378,6 +1387,27 @@
order.ACOOLYStatus = acoolyStatus;
order.FinishTime = DateTime.Now;
await _lifePayOrderRepository.UpdateAsync(order);
+
+ if (order.LifePayOrderStatus == LifePayOrderStatusEnum.宸插畬鎴�)
+ {
+ /// 姣涘埄
+ var grossProfit = order.RechargeAmount * (order.ChannleRate - order.PlatformRate) / 100;
+ /// 娓犻亾浣ｉ噾 锛�(鍏呭�奸潰棰� * 娓犻亾鎶樻墸姣斾緥)-(鍏呭�奸潰棰� * 骞冲彴鎶樻墸姣斾緥)锛�* 浣ｉ噾姣斾緥
+ var channlesRakePrice = grossProfit * (order.ChannlesRakeRate) / 100;
+ if (channlesRakePrice.HasValue)
+ {
+ LifePayChannlesRake lifePayChannlesRake = new LifePayChannlesRake()
+ {
+ OrderNo = order.OrderNo,
+ PayAmount = order.PayAmount.Value,
+ ChannlesRakeRate = order.ChannlesRakeRate.Value,
+ ChannlesRakePrice = channlesRakePrice.Value,
+ FinishTime = order.FinishTime.Value,
+ ChannelId = order.ChannelId,
+ };
+ await _lifePayChannlesRakeRepository.InsertAsync(lifePayChannlesRake);
+ }
+ }
}
/// <summary>
@@ -1412,7 +1442,6 @@
}
var outRefundNo = order.ChannelId + CreateRefundOrderNo();
- order.RefundOrderNo = outRefundNo;
switch (order.LifePayType)
{
case LifePayTypeEnum.WxPay:
@@ -1427,11 +1456,6 @@
order.LifePayOrderStatus = LifePayOrderStatusEnum.閫�娆句腑;
order.LifePayRefundStatus = LifePayRefundStatusEnum.閫�娆句腑;
}
- else if (wxRefundResult.Message == "璁㈠崟宸插叏棰濋��娆�")
- {
- order.LifePayOrderStatus = LifePayOrderStatusEnum.宸查��娆�;
- order.LifePayRefundStatus = LifePayRefundStatusEnum.宸查��娆�;
- }
else
{
order.LifePayOrderStatus = LifePayOrderStatusEnum.寰呴��娆�;
@@ -1440,7 +1464,7 @@
break;
case LifePayTypeEnum.AliPay:
- var aliRefundResult = await AliTradeRefund(new AlipayTradeRefundRequest() { OutTradeNo = order.OrderNo, RefundAmount = input.RefundPrice.ToString() });
+ var aliRefundResult = await AliTradeRefund(new AlipayTradeRefundRequest() { OutTradeNo = order.OrderNo, OutRefundNo = outRefundNo, RefundAmount = input.RefundPrice.ToString() });
if (aliRefundResult.Code != AlipayResultCode.Success)
{
throw new UserFriendlyException("閫�娆惧け璐�:" + aliRefundResult.SubMsg);
@@ -1452,6 +1476,7 @@
default: throw new UserFriendlyException("閫�娆惧け璐�");
}
+ order.RefundOrderNo = outRefundNo;
order.RefundCredentialsImgUrl = input.RefundCredentialsImgUrl;
order.RefundCheckRemark = input.RefundCheckRemark;
order.RefundTime = DateTime.Now;
@@ -1569,37 +1594,23 @@
{
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.璇濊垂璁㈠崟)
+ if (input.LifePayType == LifePayOrderTypeEnum.PhoneOrder || input.LifePayType == LifePayOrderTypeEnum.ElectricOrder)
{
var extraProperties = JsonConvert.DeserializeObject<Model_UserAccountExtraProperties>(input.ExtraProperties);
if (!string.IsNullOrEmpty(extraProperties.Name) && extraProperties.Phone == user.PhoneNumber)
@@ -2041,7 +2052,6 @@
return message;
}
-
private async Task<IQueryable<LifePayOrderListOutput>> GetLifePayOrderListFilter(QueryLifePayOrderListInput input)
{
var channles = await _lifePayChannlesRep.Where(x => x.ChannlesName.Contains(input.KeyWords)).Select(x => x.ChannlesNum).ToListAsync();
@@ -2203,5 +2213,42 @@
}
}
+ 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
}
--
Gitblit v1.9.1