From b826cd87cd20fe372c718acb8a0b9c7fe9b0c89a Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期五, 06 六月 2025 13:52:00 +0800
Subject: [PATCH] feat:同步测试数据
---
LifePayment/LifePayment.Application/LifePay/LifePayService.cs | 24 +++++++++---------------
1 files changed, 9 insertions(+), 15 deletions(-)
diff --git a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
index bb94bcb..ee425c3 100644
--- a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
+++ b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
@@ -1,4 +1,5 @@
-锘縰sing LifePayment.Application.Contracts;
+锘縰sing Alipay.EasySDK.Payment.Common.Models;
+using LifePayment.Application.Contracts;
using LifePayment.Domain;
using LifePayment.Domain.LifePay;
using LifePayment.Domain.Models;
@@ -9,6 +10,7 @@
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
+using System.Data;
using System.Linq;
using System.Linq.Dynamic.Core;
using System.Threading.Tasks;
@@ -19,18 +21,7 @@
using Volo.Abp.EventBus.Distributed;
using Z.EntityFramework.Plus;
using ZeroD.Util;
-using Alipay.EasySDK.Payment.Common.Models;
using static LifePayment.Domain.Shared.LifePaymentConstant;
-using ZeroD.Util.Fadd;
-using Nest;
-using Volo.Abp.Domain.Entities;
-using Volo.Abp.ObjectMapping;
-using NPOI.SS.Formula.Functions;
-using StackExchange.Redis;
-using static Volo.Abp.Identity.Settings.IdentitySettingNames;
-using static Microsoft.EntityFrameworkCore.DbLoggerCategory;
-using LifePayment.Application.LifePay;
-using Alipay.AopSdk.Core.Domain;
namespace LifePayment.Application;
@@ -943,7 +934,6 @@
var platformRate = await _lifePayRateRepository.FirstOrDefaultAsync(r => r.RateType == LifePayRateTypeEnum.渚涘簲鍟嗘姌鎵ｄ环);
-
var orderInput = new CreateLifePayOrderInput
{
OrderNo = channle.ChannlesNum + CreateOrderNo(),
@@ -1378,7 +1368,7 @@
/// <param name="orderNo"></param>
/// <param name="outOrderNo"></param>
/// <returns></returns>
- public async Task ACOOLYOrderNotifyHandler(string orderNo, string acoolyOrderNo, LifePayOrderStatusEnum status, ACOOLYStatusEnum acoolyStatus, decimal payAmount, string refundApplyRemark)
+ public async Task ACOOLYOrderNotifyHandler(string orderNo, string acoolyOrderNo, LifePayOrderStatusEnum status, ACOOLYStatusEnum acoolyStatus, decimal payAmount, string refundApplyRemark, decimal? parValue = 0, decimal? actualParValue = 0)
{
var order = await _lifePayOrderRepository.Where(x => x.OrderNo == orderNo).FirstOrDefaultAsync();
CheckExtensions.IfTrueThrowUserFriendlyException(order == null, "璁㈠崟涓嶅瓨鍦�");
@@ -1434,7 +1424,7 @@
/// 鍒涘缓鐢熸椿缂磋垂娑堣垂璁板綍
await _lifePayOrderService.CreatLifePayConsumption(acoolyStatus, order.OrderNo, order.ACOOLYOrderNo,
- order.PlatformDeductionAmount ?? 0, order.ChannelId, order.CreationTime, order.FinishTime);
+ order.PlatformDeductionAmount ?? 0, order.ChannelId, order.CreationTime, order.FinishTime, order.ChannleRate, parValue, actualParValue);
}
/// <summary>
@@ -1695,6 +1685,10 @@
{
order.LifePayOrderStatus = LifePayOrderStatusEnum.宸插畬鎴�;
}
+ else
+ {
+ order.LifePayOrderStatus = LifePayOrderStatusEnum.閫�娆惧け璐�;
+ }
order.RefundCheckRemark = input.RefundCheckRemark;
order.RefundCheckUserId = CurrentUser.Id;
--
Gitblit v1.9.1