Merge branch 'develop' of http://132.232.92.186:3000/XinXiBu/OA2023 into develop

OASystem/OASystem.Api/Controllers/PersonnelModuleController.cs

@@ -15,6 +15,7 @@ using OASystem.Domain.Entities.PersonnelModule;
 using OASystem.Domain.ViewModels.PersonnelModule;
 using OASystem.Domain.ViewModels.QiYeWeChat;
 using OASystem.Infrastructure.Repositories.PersonnelModule;
+using Org.BouncyCastle.Asn1.Ocsp;
 using StackExchange.Redis;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -1707,7 +1708,11 @@ namespace OASystem.API.Controllers
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         public async Task<IActionResult> Test_QIYEWX(PostTourClientListDownloadFile _dto)
         {
-            DeleReminderMessage.PostMessageByWebhook();
+            //List<string> templist = new List<string>() { 234.ToString() };
+            //await AppNoticeLibrary.SendUserMsg_GroupStatus_AuditFee(14090, templist, QiyeWeChatEnum.TestChat);
+
+
+            //DeleReminderMessage.PostMessageByWebhook();
             //GroupStatus_UserSimplelistView list = await _qiYeWeChatApiService.GroupStatus_GetUserList();
 
             //创建群聊

OASystem/OASystem.Api/OAMethodLib/QiYeWeChatAPI/AppNotice/Library.cs

@@ -106,7 +106,7 @@ namespace OASystem.API.OAMethodLib.QiYeWeChatAPI.AppNotice
             List<string> qwUserIdList = GetQiyeChatUserIdList(userId);
             if (qwUserIdList.Count > 0)
             {
-                ResponseBase result = await _qiYeWeChatApiService.GroupStatus_SendMessage_ToUser_Markdown(userId, MarkdownLib.GroupStatus_Create(info));
+                ResponseBase result = await _qiYeWeChatApiService.GroupStatus_SendMessage_ToUser_Markdown(qwUserIdList, MarkdownLib.GroupStatus_Create(info));
 
                 if (result.errcode != 0)
                 {
@@ -500,7 +500,7 @@ namespace OASystem.API.OAMethodLib.QiYeWeChatAPI.AppNotice
             List<string> qwUserIdList = GetQiyeChatUserIdList(userId);
             if (qwUserIdList.Count > 0)
             {
-                ResponseBase result = await _qiYeWeChatApiService.GroupStatus_SendMessage_ToUser_Markdown(userId, MarkdownLib.AuditResult_ApplyFee_User(info));
+                ResponseBase result = await _qiYeWeChatApiService.GroupStatus_SendMessage_ToUser_Markdown(qwUserIdList, MarkdownLib.AuditResult_ApplyFee_User(info));
 
                 if (ccp.IsAuditGM == 1)
                 {
@@ -595,7 +595,7 @@ namespace OASystem.API.OAMethodLib.QiYeWeChatAPI.AppNotice
             List<string> qwUserIdList = GetQiyeChatUserIdList(userId);
             if (qwUserIdList.Count > 0)
             {
-                ResponseBase result = await _qiYeWeChatApiService.GroupStatus_SendMessage_ToUser_Markdown(userId, MarkdownLib.PayResult_Group_ToUser(info));
+                ResponseBase result = await _qiYeWeChatApiService.GroupStatus_SendMessage_ToUser_Markdown(qwUserIdList, MarkdownLib.PayResult_Group_ToUser(info));
 
                 if (result.errcode != 0)
                 {
@@ -743,7 +743,7 @@ namespace OASystem.API.OAMethodLib.QiYeWeChatAPI.AppNotice
             List<string> qwUserIdList = GetQiyeChatUserIdList(userId);
             if (qwUserIdList.Count > 0)
             {
-                ResponseBase result = await _qiYeWeChatApiService.GroupStatus_SendMessage_ToUser_Markdown(userId, MarkdownLib.DailyPayReminder_Audit_ToUser(info));
+                ResponseBase result = await _qiYeWeChatApiService.GroupStatus_SendMessage_ToUser_Markdown(qwUserIdList, MarkdownLib.DailyPayReminder_Audit_ToUser(info));
                 if (result.errcode != 0)
                 {
                     //抄送日志 
@@ -772,7 +772,7 @@ namespace OASystem.API.OAMethodLib.QiYeWeChatAPI.AppNotice
             List<string> qwUserIdList = GetQiyeChatUserIdList(userId);
             if (qwUserIdList.Count > 0)
             {
-                ResponseBase result = await _qiYeWeChatApiService.GroupStatus_SendMessage_ToUser_Markdown(userId, MarkdownLib.DailyPayReminder_Pay_ToUser(info));
+                ResponseBase result = await _qiYeWeChatApiService.GroupStatus_SendMessage_ToUser_Markdown(qwUserIdList, MarkdownLib.DailyPayReminder_Pay_ToUser(info));
                 if (result.errcode != 0)
                 {
                     //抄送日志 

OASystem/OASystem.Api/OAMethodLib/QiYeWeChatAPI/QiYeWeChatApiService.cs

@@ -1550,7 +1550,7 @@ namespace OASystem.API.OAMethodLib.QiYeWeChatAPI
             };
 
 
-            string url = string.Format("/cgi-bin/message/send?access_token={0}", access_Token.access_token);
+            string url = string.Format("/cgi-bin/message/send?access_token={0}&debug=1", access_Token.access_token);
             var json = System.Text.Json.JsonSerializer.Serialize(reqJson);
             var content = new StringContent(json, Encoding.UTF8, "application/json");
             var create_Req = await _httpClient.PostAsync(url, content);

OASystem/OASystem.Domain/ViewModels/Groups/Grp_CarTouristGuideGroundView.cs

@@ -129,5 +129,10 @@ namespace OASystem.Domain.ViewModels.Groups
         /// </summary>
         public string priceTypeStr { get; set; }
         public int IsPay { get; set; }
+
+        /// <summary>
+        /// 费用名称
+        /// </summary>
+        public string priceName {  get; set; }
     }
 }