fix:提交

zhengyuxuan

2025-03-31 fc5fc5bcb84ad464638008768932e47ad36c36af

fix:提交

 LifePayment/LifePayment.Application/LifePay/LifePayOrderService.cs

@@ -240,7 +240,7 @@
                            {
                                data.ExtraProperties = JsonConvert.SerializeObject(query);
                                data.FinishTime = Convert.ToDateTime(query.SendPayDate);
                                data.Amount = Convert.ToDecimal(query.PayAmount);
                                data.Amount = Convert.ToDecimal(query.TotalAmount);
                                await _lifePayExpensesReceiptsRepository.InsertAsync(data);
                            }
                        }

 LifePayment/LifePayment.Application/LifePay/LifePayService.cs

@@ -1351,10 +1351,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())

 LifePayment/LifePayment.HttpApi/LifePay/AliPayNotifyController.cs

@@ -64,8 +64,7 @@
                    await _lifePayService.LifePaySuccessHandler(input.OutTradeNo, input.TradeNo);
                    // 插入收支流水
                    await _lifePayOrderService.AddLifePayExpensesReceipts(new AddLifePayExpensesReceiptsInput() { OrderNo = input.OutTradeNo, 
                        OutOrderNo = input.TradeNo ,LifePayType = LifePayTypeEnum.AliPay,ExpensesReceiptsType = ExpensesReceiptsTypeEnum.Expenses,
                        Amount = input.ReceiptAmount.Value });
                        OutOrderNo = input.TradeNo ,LifePayType = LifePayTypeEnum.AliPay,ExpensesReceiptsType = ExpensesReceiptsTypeEnum.Expenses });
                }
                else if((input.TradeStatus == LifePaymentConstant.AliPayStatus.支付成功 && input.OutBizNo.IsNotNullOrEmpty() && input.RefundFee.HasValue) ||
                    input.TradeStatus == LifePaymentConstant.AliPayStatus.超时关闭)
@@ -77,8 +76,7 @@
                        OrderNo = input.OutTradeNo,
                        OutOrderNo = input.TradeNo,
                        LifePayType = LifePayTypeEnum.AliPay,
                        ExpensesReceiptsType = ExpensesReceiptsTypeEnum.Receipts,
                        Amount = input.ReceiptAmount.Value
                        ExpensesReceiptsType = ExpensesReceiptsTypeEnum.Receipts
                    });
                }
            }