From 6ddc5caa57801cf4ccc9d23b309d0cdb7ac6a36f Mon Sep 17 00:00:00 2001
From: 移动系统liao <liaoxujun@qq.com>
Date: 星期一, 30 九月 2024 15:15:18 +0800
Subject: [PATCH] no message
---
/dev/null | 11 -----------
.gitignore | 1 +
cylsg/EzInitQ/PayServiceMessageQ.cs | 26 ++++++++++++++++++++------
3 files changed, 21 insertions(+), 17 deletions(-)
diff --git a/.gitignore b/.gitignore
index 016b75c..4e41395 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,3 +37,4 @@
cylsg/EzJob/obj/
cylsg/cylsg.Application/cylsg.Application.xml
cylsg/cylsg.Web.Entry/application.log
+cylsg/cylsg.Web.Entry/Properties/PublishProfiles/FolderProfile.pubxml.user
diff --git a/cylsg/EzInitQ/PayServiceMessageQ.cs b/cylsg/EzInitQ/PayServiceMessageQ.cs
index ba4a9d4..a113317 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())
diff --git a/cylsg/cylsg.Web.Entry/Properties/PublishProfiles/FolderProfile.pubxml.user b/cylsg/cylsg.Web.Entry/Properties/PublishProfiles/FolderProfile.pubxml.user
deleted file mode 100644
index 222dddb..0000000
--- a/cylsg/cylsg.Web.Entry/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ /dev/null
@@ -1,11 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
-<!--
-https://go.microsoft.com/fwlink/?LinkID=208121.
--->
-<Project>
- <PropertyGroup>
- <_PublishTargetUrl>D:\workdir\宸濆嵃涓存椂宸cylsg\cylsg.Web.Entry\bin\Release\net8.0\publish\</_PublishTargetUrl>
- <History>True|2024-09-25T07:01:06.5999086Z;True|2024-09-25T14:59:41.7822144+08:00;True|2024-09-25T14:29:50.2870562+08:00;True|2024-09-25T14:23:43.9625627+08:00;True|2024-09-25T14:20:00.9806024+08:00;True|2024-09-25T14:06:51.1188532+08:00;</History>
- <LastFailureDetails />
- </PropertyGroup>
-</Project>
\ No newline at end of file
--
Gitblit v1.9.1