From 18a4451e5b7bf8f7f6a260796acb24adb3b2ccda Mon Sep 17 00:00:00 2001 From: 移动系统liao <liaoxujun@qq.com> Date: 星期一, 14 十月 2024 15:34:28 +0800 Subject: [PATCH] 修正提现逻辑,实现重新建单支付 API --- cylsg/EzJob/WeChatJob.cs | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/cylsg/EzJob/WeChatJob.cs b/cylsg/EzJob/WeChatJob.cs index 3003768..3f45ef9 100644 --- a/cylsg/EzJob/WeChatJob.cs +++ b/cylsg/EzJob/WeChatJob.cs @@ -33,7 +33,10 @@ } var WeChatTransferOrderRs = new BaseRepository<WeChatTransferOrder>(); - var OderList = await WeChatTransferOrderRs.AsQueryable().Includes(x=>x.TransferDetailList).Where(x => (x.BatchId != null && x.BatchId != "")&&(x.BatchStatus==null|| x.BatchStatus == "ACCEPTED" || x.BatchStatus == "PROCESSING")).ToListAsync(); + var OderList = await WeChatTransferOrderRs.AsQueryable().Includes(x=>x.TransferDetailList).Where(x => (x.BatchId != null && x.BatchId != "")&&( + (x.BatchStatus==null&&x.ErrorCode!= "INVALID_REQUEST") //浠h〃鏀粯鏃剁珛鍗虫姤閿欙紝涓嶄簣鏌ヨ + || x.BatchStatus == "ACCEPTED" || x.BatchStatus == "PROCESSING") + && x.IsSetOK==false).ToListAsync(); foreach( var o in OderList ) { @@ -53,13 +56,15 @@ { //宸茬粡鍏ㄩ儴瀹屾垚 o.BatchStatus= ret.TransferBatch.BatchStatus; - o.UpDataBy = "ExecuteAsync"; + o.UpDataBy = "鏌ヨ浠诲姟WeChatJob"; o.UpDataTime=DateTime.Now; o.CloseReason = ret.TransferBatch.CloseReason; o.FailAmount= ret.TransferBatch.FailAmount; o.FailNum = ret.TransferBatch.FailNumber; o.SuccessNum = ret.TransferBatch.SuccessNumber; o.SuccessAmount= ret.TransferBatch.SuccessAmount; + o.ErrorCode = ret.ErrorCode; + o.ErrorMsg = ret.ErrorCode; foreach (var item in o.TransferDetailList) { var del =ret.TransferDetailList.Where(x=>x.OutDetailNumber==item.OutDetailNumber).FirstOrDefault(); @@ -102,13 +107,15 @@ if(ret.TransferBatch.BatchStatus== "PROCESSING") { o.BatchStatus = ret.TransferBatch.BatchStatus; - o.UpDataBy = "ExecuteAsync"; + o.UpDataBy = "鏌ヨ浠诲姟WeChatJob"; o.UpDataTime = DateTime.Now; o.CloseReason = ret.TransferBatch.CloseReason; o.FailAmount = ret.TransferBatch.FailAmount; o.FailNum = ret.TransferBatch.FailNumber; o.SuccessNum = ret.TransferBatch.SuccessNumber; o.SuccessAmount = ret.TransferBatch.SuccessAmount; + o.ErrorMsg = null; + o.ErrorCode = null; } } else @@ -116,7 +123,7 @@ //澶勭悊澶辫触 o.ErrorCode = ret.ErrorCode; o.ErrorMsg = ret.ErrorMessage; - o.UpDataBy = "ExecuteAsync"; + o.UpDataBy = "鏌ヨ浠诲姟WeChatJob"; o.UpDataTime = DateTime.Now; -- Gitblit v1.9.1