From 6739e98662c16571da7aec0e9b52fab0afd3833b Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期五, 13 六月 2025 14:07:28 +0800
Subject: [PATCH] fix:修订支付回调和供应商回调并发问题
---
LifePayment/LifePayment.HttpApi/LifePay/ACOOLYNotifyController.cs | 60 +++++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 45 insertions(+), 15 deletions(-)
diff --git a/LifePayment/LifePayment.HttpApi/LifePay/ACOOLYNotifyController.cs b/LifePayment/LifePayment.HttpApi/LifePay/ACOOLYNotifyController.cs
index 8c2b4be..d44e90d 100644
--- a/LifePayment/LifePayment.HttpApi/LifePay/ACOOLYNotifyController.cs
+++ b/LifePayment/LifePayment.HttpApi/LifePay/ACOOLYNotifyController.cs
@@ -7,9 +7,11 @@
using System;
using System.IO;
using System.Text;
+using System.Threading;
using System.Threading.Tasks;
using Volo.Abp;
using Volo.Abp.AspNetCore.Mvc;
+using Volo.Abp.DistributedLocking;
using Volo.Abp.Uow;
namespace LifePayment.HttpApi
@@ -20,14 +22,17 @@
public class ACOOLYNotifyController : AbpController
{
private readonly ILifePayService _lifePayService;
+ private readonly IAbpDistributedLock distributedLock;
private readonly ILogger<ACOOLYNotifyController> _logger;
public ACOOLYNotifyController(
ILogger<ACOOLYNotifyController> logger,
- ILifePayService lifePayService)
+ ILifePayService lifePayService,
+ IAbpDistributedLock distributedLock)
{
_logger = logger;
_lifePayService = lifePayService;
+ this.distributedLock = distributedLock;
}
/// <summary>
@@ -35,11 +40,11 @@
/// </summary>
/// <returns></returns>
[HttpPost]
- [UnitOfWork]
[AllowAnonymous]
public async Task ACOOLYNotify()
{
_logger.LogError("ACOOLY鍥炶皟閫氱煡寮�濮嬭繘鍏�");
+ Thread.Sleep(200);
var body = string.Empty;
using (var reader = new StreamReader(Request.Body, Encoding.UTF8))
{
@@ -56,6 +61,9 @@
ACOOLYStatusEnum acoolyStatus = ACOOLYStatusEnum.鍏呭�煎け璐�;
var acoolyOrderNo = string.Empty;
decimal payAmount = 0;
+ decimal parValue = 0;
+ decimal actualParValue = 0;
+ string refundApplyRemark = string.Empty;
_logger.LogError("ACOOLY鍥炶皟閫氬鐞嗙被鍨嬶細" + baseInfo.Service);
_logger.LogError("ACOOLY鍥炶皟鍐呭锛�" + body);
switch (baseInfo.Service)
@@ -65,6 +73,8 @@
orderNo = confirmElectricOrderResponse.ElectricChargeOrder.OutOrderNo;
acoolyOrderNo = confirmElectricOrderResponse.ElectricChargeOrder.BusiOrderNo;
payAmount = confirmElectricOrderResponse.ElectricChargeOrder.PayAmount;
+ actualParValue = confirmElectricOrderResponse.ElectricChargeOrder.ActualParValue;
+ parValue = confirmElectricOrderResponse.ElectricChargeOrder.ParValue;
_logger.LogError("ACOOLY鍥炶皟閫氬鐞嗙粨鏋滅姸鎬侊細" + confirmElectricOrderResponse.ElectricChargeOrder.Status);
if (!confirmElectricOrderResponse.Success
@@ -77,7 +87,7 @@
if (confirmElectricOrderResponse.ElectricChargeOrder.Status == ACOOLYConstant.Status.鍏呭�兼垚鍔�)
{
status = LifePayOrderStatusEnum.宸插畬鎴�;
- acoolyStatus = ACOOLYStatusEnum.鍏呭�兼垚鍔�;
+ acoolyStatus = ACOOLYStatusEnum.宸插畬鎴�;
}
else
if (confirmElectricOrderResponse.ElectricChargeOrder.Status == ACOOLYConstant.Status.鍏呭�间腑)
@@ -90,17 +100,18 @@
{
status = LifePayOrderStatusEnum.寰呴��娆�;
acoolyStatus = ACOOLYStatusEnum.鍏呭�煎け璐�;
+ refundApplyRemark = "渚涘簲鍟嗗厖鍊煎け璐�";
}
else
if (confirmElectricOrderResponse.ElectricChargeOrder.Status == ACOOLYConstant.Status.閫�娆句腑)
{
- status = LifePayOrderStatusEnum.宸插畬鎴�;
- acoolyStatus = ACOOLYStatusEnum.宸查��娆�;
+ status = LifePayOrderStatusEnum.閫�娆句腑;
+ acoolyStatus = ACOOLYStatusEnum.閫�娆句腑;
}
else
if (confirmElectricOrderResponse.ElectricChargeOrder.Status == ACOOLYConstant.Status.閫�娆惧畬鎴�)
{
- status = LifePayOrderStatusEnum.宸插畬鎴�;
+ status = LifePayOrderStatusEnum.寰呴��娆�;
acoolyStatus = ACOOLYStatusEnum.宸查��娆�;
}
else
@@ -108,6 +119,13 @@
{
status = LifePayOrderStatusEnum.寰呴��娆�;
acoolyStatus = ACOOLYStatusEnum.鍏呭�煎け璐�;
+ }
+ else
+ if (confirmElectricOrderResponse.ElectricChargeOrder.Status == ACOOLYConstant.Status.閮ㄥ垎鍏呭�兼垚鍔�)
+ {
+ status = LifePayOrderStatusEnum.寰呴��娆�;
+ acoolyStatus = ACOOLYStatusEnum.閮ㄥ垎鍏呭�兼垚鍔�;
+ refundApplyRemark = confirmElectricOrderResponse.ElectricChargeOrder.ResponseMessage;
}
break;
case ACOOLYConstant.Sevice.ConfirmPhoneOrder:
@@ -127,7 +145,7 @@
if (confirmPhoneOrderResponse.PhoneChargeOrder.Status == ACOOLYConstant.Status.鍏呭�兼垚鍔�)
{
status = LifePayOrderStatusEnum.宸插畬鎴�;
- acoolyStatus = ACOOLYStatusEnum.鍏呭�兼垚鍔�;
+ acoolyStatus = ACOOLYStatusEnum.宸插畬鎴�;
}
else
@@ -145,13 +163,13 @@
else
if (confirmPhoneOrderResponse.PhoneChargeOrder.Status == ACOOLYConstant.Status.閫�娆句腑)
{
- status = LifePayOrderStatusEnum.宸插畬鎴�;
- acoolyStatus = ACOOLYStatusEnum.宸查��娆�;
+ status = LifePayOrderStatusEnum.閫�娆句腑;
+ acoolyStatus = ACOOLYStatusEnum.閫�娆句腑;
}
else
if (confirmPhoneOrderResponse.PhoneChargeOrder.Status == ACOOLYConstant.Status.閫�娆惧畬鎴�)
{
- status = LifePayOrderStatusEnum.宸插畬鎴�;
+ status = LifePayOrderStatusEnum.寰呴��娆�;
acoolyStatus = ACOOLYStatusEnum.宸查��娆�;
}
else
@@ -159,6 +177,12 @@
{
status = LifePayOrderStatusEnum.寰呴��娆�;
acoolyStatus = ACOOLYStatusEnum.鍏呭�煎け璐�;
+ }
+ else
+ if (confirmPhoneOrderResponse.PhoneChargeOrder.Status == ACOOLYConstant.Status.閮ㄥ垎鍏呭�兼垚鍔�)
+ {
+ status = LifePayOrderStatusEnum.寰呴��娆�;
+ acoolyStatus = ACOOLYStatusEnum.閮ㄥ垎鍏呭�兼垚鍔�;
}
break;
case ACOOLYConstant.Sevice.ConfirmGasOrder:
@@ -178,7 +202,7 @@
if (confirmGasOrderResponse.GasChargeOrder.Status == ACOOLYConstant.Status.鍏呭�兼垚鍔�)
{
status = LifePayOrderStatusEnum.宸插畬鎴�;
- acoolyStatus = ACOOLYStatusEnum.鍏呭�兼垚鍔�;
+ acoolyStatus = ACOOLYStatusEnum.宸插畬鎴�;
}
else
@@ -196,13 +220,13 @@
else
if (confirmGasOrderResponse.GasChargeOrder.Status == ACOOLYConstant.Status.閫�娆句腑)
{
- status = LifePayOrderStatusEnum.宸插畬鎴�;
- acoolyStatus = ACOOLYStatusEnum.宸查��娆�;
+ status = LifePayOrderStatusEnum.閫�娆句腑;
+ acoolyStatus = ACOOLYStatusEnum.閫�娆句腑;
}
else
if (confirmGasOrderResponse.GasChargeOrder.Status == ACOOLYConstant.Status.閫�娆惧畬鎴�)
{
- status = LifePayOrderStatusEnum.宸插畬鎴�;
+ status = LifePayOrderStatusEnum.寰呴��娆�;
acoolyStatus = ACOOLYStatusEnum.宸查��娆�;
}
else
@@ -211,12 +235,18 @@
status = LifePayOrderStatusEnum.寰呴��娆�;
acoolyStatus = ACOOLYStatusEnum.鍏呭�煎け璐�;
}
+ else
+ if (confirmGasOrderResponse.GasChargeOrder.Status == ACOOLYConstant.Status.閮ㄥ垎鍏呭�兼垚鍔�)
+ {
+ status = LifePayOrderStatusEnum.寰呴��娆�;
+ acoolyStatus = ACOOLYStatusEnum.閮ㄥ垎鍏呭�兼垚鍔�;
+ }
break;
default:
throw new UserFriendlyException("ACOOLY鍥炶皟閫氬鐞嗙被鍨嬩笉瀛樺湪");
}
- await _lifePayService.ACOOLYOrderNotifyHandler(orderNo, acoolyOrderNo, status, acoolyStatus, payAmount);
+ await _lifePayService.ACOOLYOrderNotifyHandler(orderNo, acoolyOrderNo, status, acoolyStatus, payAmount, refundApplyRemark, parValue, actualParValue);
}
}
}
\ No newline at end of file
--
Gitblit v1.9.1