From 4686d9d5bc63a5aeb35452ee9049a4720123b992 Mon Sep 17 00:00:00 2001
From: 移动系统liao <liaoxujun@qq.com>
Date: 星期一, 30 九月 2024 15:37:14 +0800
Subject: [PATCH] no message

---
 cylsg/EzInitQ/PayServiceMessageQ.cs |   28 ++++++++++++++++++++++------
 1 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/cylsg/EzInitQ/PayServiceMessageQ.cs b/cylsg/EzInitQ/PayServiceMessageQ.cs
index ba4a9d4..a9194b3 100644
--- a/cylsg/EzInitQ/PayServiceMessageQ.cs
+++ b/cylsg/EzInitQ/PayServiceMessageQ.cs
@@ -207,13 +207,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())
             {
@@ -247,7 +253,7 @@
             _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();
@@ -262,14 +268,22 @@
 
                 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 = "宸濆嵃涓存椂宸ュ伐璧勶紝鎿嶈繃200鐨勫绗旀敮浠�";
+            requit.BatchRemark = $"{TransferOrder.user.ItCode}{userWk.name?.Substring(0,2)}{userWk.IdCode}";
 
             var ret = await _wecharPayServicecs.Transfer(requit);
             if (ret.IsSuccessful())
@@ -279,6 +293,8 @@
                 retdata.BatchStatus = ret.BatchStatus;
                 retdata.UpDataBy = "鍐嶆寰俊浠樻璇锋眰";
                 retdata.UpDataTime = DateTime.Now;
+                retdata.ErrorMsg = null;
+                retdata.ErrorCode = null;
                 await WeChatTransferOrderwork.UpdateAsync(retdata);
             }
             else

--
Gitblit v1.9.1