From e0f2b29f3349d43e7f4222e079c54ba9cc4b6ee1 Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期一, 16 六月 2025 11:09:23 +0800
Subject: [PATCH] fix:支付回调及供应商回调并发问题修订
---
LifePayment/LifePayment.HttpApi/LifePay/ACOOLYNotifyController.cs | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/LifePayment/LifePayment.HttpApi/LifePay/ACOOLYNotifyController.cs b/LifePayment/LifePayment.HttpApi/LifePay/ACOOLYNotifyController.cs
index b7dd3a4..c6304e0 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,12 @@
/// </summary>
/// <returns></returns>
[HttpPost]
- [UnitOfWork]
[AllowAnonymous]
+ [UnitOfWork(false)]
public async Task ACOOLYNotify()
{
_logger.LogError("ACOOLY鍥炶皟閫氱煡寮�濮嬭繘鍏�");
+ Thread.Sleep(200);
var body = string.Empty;
using (var reader = new StreamReader(Request.Body, Encoding.UTF8))
{
@@ -100,13 +106,13 @@
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
@@ -158,13 +164,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
@@ -215,13 +221,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
--
Gitblit v1.9.1