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 | 145 +++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 136 insertions(+), 9 deletions(-)
diff --git a/cylsg/EzInitQ/PayServiceMessageQ.cs b/cylsg/EzInitQ/PayServiceMessageQ.cs
index a4224b7..d4e47d4 100644
--- a/cylsg/EzInitQ/PayServiceMessageQ.cs
+++ b/cylsg/EzInitQ/PayServiceMessageQ.cs
@@ -8,6 +8,7 @@
using Furion;
using Furion.DatabaseAccessor;
using Furion.FriendlyException;
+using Furion.Logging;
using InitQ.Abstractions;
using InitQ.Attributes;
using Mapster;
@@ -29,14 +30,7 @@
{
private IEzCoreNetRedisService _ezCoreNetRedisService;
private IWecharPayServicecs _wecharPayServicecs;
- private IMapper _mapper;
- //public PayServiceMessageQ(IEzCoreNetRedisService ezCoreNetRedisService,IWecharPayServicecs wecharPayServicecs,IMapper mapper) {
-
- // _ezCoreNetRedisService = ezCoreNetRedisService;
- // _wecharPayServicecs = wecharPayServicecs;
- // _mapper = mapper;
-
- //}
+ private IMapper _mapper;
/// <summary>
/// 寰俊杞处闃熷垪澶勭悊
@@ -181,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}");
@@ -191,5 +187,136 @@
}
+
+ [Subscribe(InitQMessages.WxTransfer)]
+ public async void WxTransfer(string msg)
+ {
+ _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).Includes(x => x.user).Where(x=>x.Id==msg.toInt()).FirstAsync();
+ if(TransferOrder == null)
+ {
+ Log.Error($"WxTransfer寰俊鏀粯澶勭悊 澶辫触锛屽師鍥犳槸娌℃湁鎵惧埌TransferOrder 锛屼紶閫扞d涓簕msg}");
+
+ return;
+ }
+ if(!string.IsNullOrEmpty(TransferOrder.BatchStatus))
+ {
+
+ 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 = $"{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);
+ retdata.BatchId = ret.BatchId;
+ retdata.BatchStatus = ret.BatchStatus;
+ retdata.UpDataBy = "寰俊浠樻璇锋眰涔嬪悗";
+ retdata.UpDataTime = DateTime.Now;
+ retdata.ErrorMsg = ret.ErrorMessage;
+ retdata.ErrorCode = ret.ErrorCode;
+
+ await WeChatTransferOrderwork.UpdateAsync(retdata);
+ }
+ else
+ {
+ var retdata = await WeChatTransferOrderwork.GetByIdAsync(TransferOrder.Id);
+ retdata.ErrorCode = ret.ErrorCode;
+ retdata.ErrorMsg = ret.ErrorMessage;
+ retdata.BatchStatus = ret.BatchStatus;
+ retdata.UpDataBy = "寰俊浠樻璇锋眰涔嬪悗";
+ retdata.UpDataTime = DateTime.Now;
+ await WeChatTransferOrderwork.UpdateAsync(retdata);
+ Log.Error($"WxTransfer寰俊鏀粯澶勭悊 澶辫触锛屼紶閫扞d涓簕msg} 閿欒鍘熷洜:{retdata.ErrorMsg}");
+ return;
+ }
+
+
+ }
+
+
+ [Subscribe(InitQMessages.WxTransferAg)]
+ public async void WxTransferAg(string msg)
+ {
+ _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).Includes(x=>x.user).Where(x => x.Id == msg.toInt()).FirstAsync();
+ if (TransferOrder == null)
+ {
+ Log.Error($" 鍐嶆璋冪敤WxTransfer寰俊鏀粯澶勭悊 澶辫触锛屽師鍥犳槸娌℃湁鎵惧埌TransferOrder锛屼紶閫扞d涓簕msg}");
+
+ 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.BatchName = msg;
+ requit.AppId = App.Configuration["WechatAPP:AppId"];
+ requit.BatchName = "灏忛晣涓存椂宸ュ伐璧勮浆璐�";
+ 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);
+ retdata.BatchId = ret.BatchId;
+ retdata.BatchStatus = ret.BatchStatus;
+ retdata.UpDataBy = "鍐嶆寰俊浠樻璇锋眰";
+ retdata.UpDataTime = DateTime.Now;
+ retdata.ErrorMsg = ret.ErrorMessage;
+ retdata.ErrorCode = ret.ErrorCode;
+ await WeChatTransferOrderwork.UpdateAsync(retdata);
+ }
+ else
+ {
+ var retdata = await WeChatTransferOrderwork.GetByIdAsync(TransferOrder.Id);
+ retdata.ErrorCode = ret.ErrorCode;
+ retdata.ErrorMsg = ret.ErrorMessage;
+ retdata.BatchStatus = ret.BatchStatus;
+ retdata.UpDataBy = "鍐嶅井淇′粯娆捐姹�";
+ retdata.UpDataTime = DateTime.Now;
+ await WeChatTransferOrderwork.UpdateAsync(retdata);
+ Log.Error($"WxTransfer寰俊鏀粯澶勭悊 澶辫触锛屼紶閫扞d涓簕msg} 閿欒鍘熷洜:{retdata.ErrorMsg}");
+
+
+
+ return;
+ }
+
+
+ }
}
}
--
Gitblit v1.9.1