From d86bc04d0b34f2b7d9ddbd30ee703b51d48876e8 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 05 二月 2025 09:51:15 +0800
Subject: [PATCH] 修改审核中员工排在前边
---
cylsg/EzInitQ/PayServiceMessageQ.cs | 46 +++++++++++++++++++++++++++++++++++-----------
1 files changed, 35 insertions(+), 11 deletions(-)
diff --git a/cylsg/EzInitQ/PayServiceMessageQ.cs b/cylsg/EzInitQ/PayServiceMessageQ.cs
index 1b98ba1..d4e47d4 100644
--- a/cylsg/EzInitQ/PayServiceMessageQ.cs
+++ b/cylsg/EzInitQ/PayServiceMessageQ.cs
@@ -175,7 +175,9 @@
retdata.BatchStatus= ret.BatchStatus;
retdata.UpDataBy = "寰俊浠樻璇锋眰涔嬪悗";
retdata.UpDataTime= DateTime.Now;
- await WeChatTransferOrderwork.UpdateAsync(retdata);
+ retdata.ErrorMsg = ret.ErrorMessage;
+ retdata.ErrorCode = ret.ErrorCode;
+ await WeChatTransferOrderwork.UpdateAsync(retdata);
}
else
throw Oops.Oh($"寰俊璇锋眰浠樻澶辫触+++++++++++++{ret.ToString()}+++++++++++msg{msg}");
@@ -195,7 +197,7 @@
var WeChatTransferOrderwork = new BaseRepository<WeChatTransferOrder>();
- var TransferOrder = await WeChatTransferOrderwork.AsQueryable().Includes(x => x.TransferDetailList).Where(x=>x.Id==msg.toInt()).FirstAsync();
+ var TransferOrder = await WeChatTransferOrderwork.AsQueryable().Includes(x => x.TransferDetailList).Includes(x => x.user).Where(x=>x.Id==msg.toInt()).FirstAsync();
if(TransferOrder == null)
{
Log.Error($"WxTransfer寰俊鏀粯澶勭悊 澶辫触锛屽師鍥犳槸娌℃湁鎵惧埌TransferOrder 锛屼紶閫扞d涓簕msg}");
@@ -207,13 +209,19 @@
return;
}
-
+ var UserWork = new BaseRepository<UserWorker>();
+ var userWk = await UserWork.GetFirstAsync(x => x.UserId == TransferOrder.UserID);
+ if(userWk == null) {
+ Log.Error($"WxTransfer寰俊鏀粯澶勭悊 澶辫触锛岃鐢ㄦ埛涓嶆槸宸ヤ汉 锛屼紶閫掔殑TransferOrder Id涓簕msg}");
+
+ return;
+ }
// 鍙戣捣鏀粯
var requit = _mapper.Map<CreateTransferBatchRequest>(TransferOrder);
requit.AppId = App.Configuration["WechatAPP:AppId"];
requit.BatchName = "灏忛晣涓存椂宸ュ伐璧勮浆璐�";
- requit.BatchRemark = "宸濆嵃涓存椂宸ュ伐璧勶紝鎿嶈繃200鐨勫绗旀敮浠�";
-
+ requit.BatchRemark = $"{TransferOrder.user.ItCode}{userWk.name?.Substring(0, 2)}{userWk.IdCode}";
+
var ret = await _wecharPayServicecs.Transfer(requit);
if (ret.IsSuccessful())
{
@@ -222,6 +230,9 @@
retdata.BatchStatus = ret.BatchStatus;
retdata.UpDataBy = "寰俊浠樻璇锋眰涔嬪悗";
retdata.UpDataTime = DateTime.Now;
+ retdata.ErrorMsg = ret.ErrorMessage;
+ retdata.ErrorCode = ret.ErrorCode;
+
await WeChatTransferOrderwork.UpdateAsync(retdata);
}
else
@@ -247,29 +258,37 @@
_ezCoreNetRedisService = App.GetService<IEzCoreNetRedisService>();
_wecharPayServicecs = App.GetService<IWecharPayServicecs>();
_mapper = App.GetService<IMapper>();
-
+
var WeChatTransferOrderwork = new BaseRepository<WeChatTransferOrder>();
- var TransferOrder = await WeChatTransferOrderwork.AsQueryable().Includes(x => x.TransferDetailList).Where(x => x.Id == msg.toInt()).FirstAsync();
+ var TransferOrder = await WeChatTransferOrderwork.AsQueryable().Includes(x => x.TransferDetailList).Includes(x=>x.user).Where(x => x.Id == msg.toInt()).FirstAsync();
if (TransferOrder == null)
{
- Log.Error($" 鍐嶆璋冪敤WxTransfer寰俊鏀粯澶勭悊 澶辫触锛屽師鍥犳槸娌℃湁鎵惧埌TransferOrder 锛屼紶閫扞d涓簕msg}");
+ Log.Error($" 鍐嶆璋冪敤WxTransfer寰俊鏀粯澶勭悊 澶辫触锛屽師鍥犳槸娌℃湁鎵惧埌TransferOrder锛屼紶閫扞d涓簕msg}");
return;
}
- if (!string.IsNullOrEmpty(TransferOrder.BatchStatus))
+
+ var UserWork = new BaseRepository<UserWorker>();
+ var userWk = await UserWork.GetFirstAsync(x => x.UserId == TransferOrder.UserID);
+ if (userWk == null)
{
+ Log.Error($"WxTransfer寰俊鏀粯澶勭悊 澶辫触锛岃鐢ㄦ埛涓嶆槸宸ヤ汉 锛屼紶閫掔殑TransferOrder Id涓簕msg}");
return;
}
+ // 鍙戣捣鏀粯
- // 鍙戣捣鏀粯
var requit = _mapper.Map<CreateTransferBatchRequest>(TransferOrder);
+
+ requit.BatchName = msg;
requit.AppId = App.Configuration["WechatAPP:AppId"];
requit.BatchName = "灏忛晣涓存椂宸ュ伐璧勮浆璐�";
- requit.BatchRemark = "宸濆嵃涓存椂宸ュ伐璧勶紝鎿嶈繃200鐨勫绗旀敮浠�";
+ requit.BatchRemark = $"{TransferOrder.user.ItCode}{userWk.name?.Substring(0,2)}{userWk.IdCode}";
var ret = await _wecharPayServicecs.Transfer(requit);
+
+
if (ret.IsSuccessful())
{
var retdata = await WeChatTransferOrderwork.GetByIdAsync(TransferOrder.Id);
@@ -277,6 +296,8 @@
retdata.BatchStatus = ret.BatchStatus;
retdata.UpDataBy = "鍐嶆寰俊浠樻璇锋眰";
retdata.UpDataTime = DateTime.Now;
+ retdata.ErrorMsg = ret.ErrorMessage;
+ retdata.ErrorCode = ret.ErrorCode;
await WeChatTransferOrderwork.UpdateAsync(retdata);
}
else
@@ -289,6 +310,9 @@
retdata.UpDataTime = DateTime.Now;
await WeChatTransferOrderwork.UpdateAsync(retdata);
Log.Error($"WxTransfer寰俊鏀粯澶勭悊 澶辫触锛屼紶閫扞d涓簕msg} 閿欒鍘熷洜:{retdata.ErrorMsg}");
+
+
+
return;
}
--
Gitblit v1.9.1