From aa62bd742942bf4e6556714224dce076dab15c9f Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期三, 11 六月 2025 13:05:19 +0800
Subject: [PATCH] feat:订单列表及导出增加运营商字段
---
LifePayment/LifePayment.Application/LifePay/LifePayService.cs | 97 +++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 94 insertions(+), 3 deletions(-)
diff --git a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
index 3179294..c2774a8 100644
--- a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
+++ b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
@@ -308,7 +308,41 @@
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;
}
@@ -768,7 +802,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 =>
@@ -786,6 +821,33 @@
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;
@@ -814,7 +876,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 =>
@@ -832,6 +895,33 @@
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;
@@ -1390,7 +1480,7 @@
order.ACOOLYOrderNo = result.ACOOLYOrderNo;
order.ACOOLYStatus = ACOOLYStatusEnum.鍏呭�间腑;
await _lifePayOrderRepository.UpdateAsync(order);
- _logger.LogInformation("鐢熸椿缂磋垂璁㈠崟鐘舵�侊細" + order.LifePayOrderStatus.ToString());
+ _logger.LogInformation("鐢熸椿缂磋垂璁㈠崟锛�" + order.ToJson());
/// 鍒涘缓鐢熸椿缂磋垂娑堣垂璁板綍
await _lifePayOrderService.CreatLifePayConsumption(ACOOLYStatusEnum.鍏呭�间腑, order.OrderNo, order.ACOOLYOrderNo,
@@ -2224,6 +2314,7 @@
PlatformDeductionAmount = a.PlatformDeductionAmount,
ACOOLYStatus = a.ACOOLYStatus,
LifePayRefundStatus = a.LifePayRefundStatus,
+ OrderParamDetailJsonStr = a.OrderParamDetailJsonStr
});
--
Gitblit v1.9.1