fix:运营端——渠道管理——渠道管理（渠道折扣接口请求进行编辑可低于供应商折扣）

sunpengfei

2025-06-10 fa48f8996e9e829bc9352863596011d1e0e95490

 LifePayment/LifePayment.HttpApi/LifePay/WxPayNotifyController.cs

@@ -11,6 +11,7 @@
using Volo.Abp.AspNetCore.Mvc;
using Volo.Abp.Caching;
using Volo.Abp.Uow;
using ZeroD.Util;

namespace LifePayment.HttpApi
{
@@ -52,19 +53,22 @@
        {
            try
            {
                _logger.LogError($"生活管家微信充值回调通知：进入微信回调:");
                var req = input.ToJson();
                _logger.LogInformation($"生活管家微信充值回调通知：进入微信回调:" + req);
                var data = _wxPayApi.AesGcmDecrypt(input.Resource.AssociatedData, input.Resource.Nonce, input.Resource.Ciphertext);
                _logger.LogError($"生活管家微信充值回调通知data：" + data);
                _logger.LogInformation($"生活管家微信充值回调通知data：" + data);
                var wxPayNotice = JsonConvert.DeserializeObject<WxPayNotice>(data);

                if (wxPayNotice.OutTradeNo.Contains("JF") )
                if (wxPayNotice.OutTradeNo.Contains("JF"))
                {
                    if (wxPayNotice.TradeState == LifePaymentConstant.WxPayStatus.支付成功)
                    {
                        var key = $"WxRechargeNotify_{wxPayNotice.OutTradeNo}";
                        if (string.IsNullOrWhiteSpace(distributedCache.Get(key)))
                        {
                            _logger.LogInformation("正在处理回调");
                            await _lifePayService.LifePaySuccessHandler(wxPayNotice.OutTradeNo, wxPayNotice.TransactionId);
                            _logger.LogInformation("已处理回调");

                            // 插入收支流水
                            await _lifePayOrderService.AddLifePayExpensesReceipts(new AddLifePayExpensesReceiptsInput()
@@ -75,13 +79,26 @@
                                ExpensesReceiptsType = ExpensesReceiptsTypeEnum.Expenses,
                                Amount = wxPayNotice.Amount.Total
                            });
                            _logger.LogInformation("已插入收支流水");

                            distributedCache.Set(key, data, new DistributedCacheEntryOptions
                            {
                                AbsoluteExpirationRelativeToNow = TimeSpan.FromMinutes(10)
                            });
                        }
                        else
                        {
                            _logger.LogInformation("已过滤重复请求");
                        }
                    }
                    else
                    {
                        _logger.LogInformation("交易状态不符合规则");
                    }
                }
                else
                {
                    _logger.LogInformation("订单号不符合规则");
                }
            }
            catch (Exception ex)
@@ -113,12 +130,12 @@
            {
                _logger.LogError($"微信退款回调通知：进入微信回调");
                var data = _wxPayApi.AesGcmDecrypt(input.Resource.AssociatedData, input.Resource.Nonce, input.Resource.Ciphertext);
                _logger.LogError($"微信退款回调通知data："+ data);
                _logger.LogError($"微信退款回调通知data：" + data);
                var wxPayNotice = JsonConvert.DeserializeObject<WxPayDomesticRefundsNotice>(data);

                if (wxPayNotice.OutTradeNo.Contains("JF"))
                {
                   

                    switch (wxPayNotice.RefundStatus)
                    {
                        case LifePaymentConstant.WxPayRefundStatus.退款成功:
@@ -139,13 +156,13 @@
                        case LifePaymentConstant.WxPayRefundStatus.退款异常:
                            await _lifePayService.LifePayRefundsHandler(wxPayNotice.OutTradeNo, LifePayRefundStatusEnum.退款中);
                            break;
                        default : await _lifePayService.LifePayRefundsHandler(wxPayNotice.OutTradeNo, LifePayRefundStatusEnum.退款中);break;
                        default: await _lifePayService.LifePayRefundsHandler(wxPayNotice.OutTradeNo, LifePayRefundStatusEnum.退款中); break;
                    }
                }
            }
            catch (Exception ex)
            {
                

                return new WxRechargeNotifyResult
                {
                    Code = "FAIL",