团组增减款项增删改查的编写

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -13,7 +13,7 @@ using TencentCloud.Ocr.V20181119.Models;
 using OASystem.Infrastructure.Tools;
 using System.Web;
 using System.Data;
-using static OASystem.Infrastructure.Repositories.Resource.AirTicketResRepository;
+using static OASystem.Infrastructure.Repositories.Groups.AirTicketResRepository;
 using static OpenAI.GPT3.ObjectModels.SharedModels.IOpenAiModels;
 using Cell = Aspose.Words.Tables.Cell;
 using Row = Aspose.Words.Tables.Row;
@@ -36,7 +36,7 @@ namespace OASystem.API.Controllers
         private readonly SqlSugarClient _sqlSugar;
         private string url;
         private string path;
-        public GroupsController(IMapper mapper,SqlSugarClient sqlSugar, GrpScheduleRepository grpScheduleRep, DelegationInfoRepository groupRepository,
+        public GroupsController(IMapper mapper, SqlSugarClient sqlSugar, GrpScheduleRepository grpScheduleRep, DelegationInfoRepository groupRepository,
             TaskAssignmentRepository taskAssignmentRep, AirTicketResRepository airTicketResRep, DecreasePaymentsRepository decreasePaymentsRep)
         {
             _mapper = mapper;
@@ -944,7 +944,7 @@ namespace OASystem.API.Controllers
                 else
                 {
                     List<AirTicketReservationsView> _AirTicketReservations = groupData.Data;
-                    if (dto.Language=="CN")
+                    if (dto.Language == "CN")
                     {
                         Document doc = new Document(AppSettingsHelper.Get("WordBasePath") + "Template/电子客票行程单模板_CN.docx");
                         DocumentBuilder builder = new DocumentBuilder(doc);
@@ -1118,12 +1118,12 @@ namespace OASystem.API.Controllers
                             {
                                 if (!name.Contains(clientName))
                                 {
-                                    name+=clientName+",";
+                                    name += clientName + ",";
                                 }
                             }
                             if (!string.IsNullOrWhiteSpace(name))
                             {
-                                table.Range.Bookmarks["ClientName"].Text = name.Substring(0,name.Length-1);
+                                table.Range.Bookmarks["ClientName"].Text = name.Substring(0, name.Length - 1);
                             }
                             else
                             {
@@ -1156,7 +1156,7 @@ namespace OASystem.API.Controllers
                         int tableIndex = 0;//表格索引
                                            //得到文档中的第一个表格
                         Table table = (Table)doc.GetChild(NodeType.Table, tableIndex, true);
-                       
+
                         List<string> texts = new List<string>();
                         foreach (var item in _AirTicketReservations)
                         {
@@ -1170,7 +1170,7 @@ namespace OASystem.API.Controllers
                                     {
                                         transDic.Add(_AirCompany.CnName, _AirCompany.EnName);
                                     }
-                                    
+
                                 }
                                 else
                                 {
@@ -1178,7 +1178,7 @@ namespace OASystem.API.Controllers
                                     {
                                         transDic.Add("--", "--");
                                     }
-                                    
+
                                 }
                             }
                             string[] nameArray = Regex.Split(item.ClientName, "\\d+\\.", RegexOptions.IgnoreCase);
@@ -1186,7 +1186,7 @@ namespace OASystem.API.Controllers
                             string name = "";
                             foreach (string clientName in nameArray)
                             {
-                                name += clientName+",";
+                                name += clientName + ",";
                             }
                             if (!texts.Contains(name))
                             {
@@ -1213,14 +1213,14 @@ namespace OASystem.API.Controllers
                                     }
                                 }
                                 Res_ThreeCode End_Three = _sqlSugar.Queryable<Res_ThreeCode>().First(a => a.Three == tempstr[3].Substring(3, 3));
-                                
+
                                 if (End_Three != null)
                                 {
                                     if (!transDic.ContainsKey(End_Three.AirPort))
                                     {
                                         transDic.Add(End_Three.AirPort, End_Three.AirPort_En);
                                     }
-                                    
+
                                 }
                                 if (!texts.Contains(item.CTypeName))
                                 {
@@ -1254,7 +1254,7 @@ namespace OASystem.API.Controllers
                                     if (!string.IsNullOrEmpty(translateResult))
                                     {
                                         str = translateResult;
-                                        str =_airTicketResRep.Processing(str);
+                                        str = _airTicketResRep.Processing(str);
                                     }
 
                                     table.Range.Bookmarks["AirlineCompany"].Text = str;
@@ -1271,7 +1271,7 @@ namespace OASystem.API.Controllers
                             string names = "";
                             foreach (string clientName in nameArray)
                             {
-                                    names += clientName + ",";
+                                names += clientName + ",";
                             }
                             if (!string.IsNullOrWhiteSpace(names))
                             {
@@ -1335,7 +1335,7 @@ namespace OASystem.API.Controllers
                                     if (!string.IsNullOrEmpty(translateResult1))
                                     {
                                         str1 = translateResult1;
-                                        str1= _airTicketResRep.Processing(str1);
+                                        str1 = _airTicketResRep.Processing(str1);
                                     }
                                     EndCity = str1;
                                 }
@@ -1545,6 +1545,157 @@ namespace OASystem.API.Controllers
                 throw;
             }
         }
+        /// <summary>
+        /// 团组增减款项操作（Status:1.新增,2.修改）
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        public async Task<IActionResult> OpDecreasePayments(DecreasePaymentsOpDto dto)
+        {
+            try
+            {
+                Result groupData = await _decreasePaymentsRep.OpDecreasePayments(dto);
+                if (groupData.Code != 0)
+                {
+                    return Ok(JsonView(false, groupData.Msg));
+                }
+                return Ok(JsonView(true, groupData.Msg, groupData.Data));
+            }
+            catch (Exception ex)
+            {
+                return Ok(JsonView(false, "程序错误！"));
+                throw;
+            }
+        }
+        /// <summary>
+        /// 团组增减款项操作 删除
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        public async Task<IActionResult> DelDecreasePayments(DelBaseDto dto)
+        {
+            try
+            {
+                var res = await _airTicketResRep.SoftDeleteByIdAsync<Grp_DecreasePayments>(dto.Id.ToString(), dto.DeleteUserId);
+                if (!res)
+                {
+                    return Ok(JsonView(false, "删除失败"));
+                }
+                return Ok(JsonView(true, "删除成功！"));
+            }
+            catch (Exception ex)
+            {
+                return Ok(JsonView(false, "程序错误！"));
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// 根据团组增减款项Id查询
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        public async Task<IActionResult> QueryDecreasePaymentsById(DecreasePaymentsByIdDto dto)
+        {
+            try
+            {
+                Result groupData = await _decreasePaymentsRep.QueryDecreasePaymentsById(dto);
+                if (groupData.Code != 0)
+                {
+                    return Ok(JsonView(false, groupData.Msg));
+                }
+                return Ok(JsonView(true, groupData.Msg, groupData.Data));
+            }
+            catch (Exception ex)
+            {
+                return Ok(JsonView(false, "程序错误！"));
+                throw;
+            }
+        }
+
+
+        /// <summary>
+        /// region 文件上传  可以带参数
+        /// </summary>
+        /// <param name="file"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        public async Task<IActionResult> UploadProject(IFormFile file)
+        {
+            try
+            {
+                if (file != null)
+                {
+                    var fileDir = AppSettingsHelper.Get("GrpFileBasePath");
+                    if (!Directory.Exists(fileDir))
+                    {
+                        Directory.CreateDirectory(fileDir);
+                    }
+                    //文件名称
+                    string projectFileName = file.FileName;
+
+                    //上传的文件的路径
+                    string filePath = fileDir + $@"\{projectFileName}";
+                    using (FileStream fs = System.IO.File.Create(filePath))
+                    {
+                        file.CopyTo(fs);
+                        fs.Flush();
+                    }
+                    return Ok(JsonView(true, "上传成功！", projectFileName));
+                }
+                else
+                {
+                    return Ok(JsonView(false, "上传失败！"));
+                }
+            }
+            catch (Exception ex)
+            {
+                return Ok(JsonView(false, "程序错误！"));
+                throw;
+            }
+            
+        }
+        /// <summary>
+        /// 删除指定文件
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        public async Task<IActionResult> DelFile(DelFileDto dto)
+        {
+            try
+            {
+                var fileDir = AppSettingsHelper.Get("GrpFileBasePath");
+                // 返回与指定虚拟路径相对应的物理路径即绝对路径
+                string filePath = fileDir+ dto.fileName;
+                // 删除该文件
+                System.IO.File.Delete(filePath);
+               int id= await _sqlSugar.Updateable<Grp_DecreasePayments>().Where(a => a.Id == dto.Id).SetColumns(a => new Grp_DecreasePayments {FilePath="" }).ExecuteCommandAsync();
+                if (id!=0)
+                {
+                    return Ok(JsonView(true, "成功！"));
+                }
+                else
+                {
+                    return Ok(JsonView(false, "失败！"));
+                }
+                
+            }
+            catch (Exception ex)
+            {
+                return Ok(JsonView(false, "程序错误！"));
+                throw;
+            }
+
+        }
         #endregion
     }
 }

OASystem/OASystem.Api/Controllers/ResourceController.cs

@@ -1,5 +1,6 @@
 using OASystem.API.OAMethodLib;
 using OASystem.Domain.Dtos.Resource;
+using OASystem.Infrastructure.Repositories.Groups;
 using System.Collections.Generic;
 
 namespace OASystem.API.Controllers

OASystem/OASystem.Api/Controllers/TencentOCRController.cs

@@ -52,7 +52,7 @@ namespace OASystem.API.Controllers
                 return Ok(JsonView("图片不能大于7M!"));
             }
 
-            var gbData = TencentOCRTools.GetOCR((int)TencentOCR.TencentOCREnum.GeneralBasic, dto);
+            var gbData = TencentOCRTools.GetOCR((int)TencentOCREnum.GeneralBasic, dto);
 
             if (gbData.Code != 0)
             {
@@ -91,7 +91,7 @@ namespace OASystem.API.Controllers
                 return Ok(JsonView("图片不能大于7M!"));
             }
 
-            var idCardData = TencentOCRTools.GetOCR((int)TencentOCR.TencentOCREnum.IDCard, dto);
+            var idCardData = TencentOCRTools.GetOCR((int)TencentOCREnum.IDCard, dto);
 
             if (idCardData.Code != 0)
             {
@@ -186,7 +186,7 @@ namespace OASystem.API.Controllers
                 return Ok(JsonView("图片不能大于7M!"));
             }
 
-            var residenceBookData = TencentOCRTools.GetOCR((int)TencentOCR.TencentOCREnum.ResidenceBooklet, dto);
+            var residenceBookData = TencentOCRTools.GetOCR((int)TencentOCREnum.ResidenceBooklet, dto);
 
             if (residenceBookData.Code != 0)
             {
@@ -218,7 +218,7 @@ namespace OASystem.API.Controllers
                 return Ok(JsonView("图片不能大于7M!"));
             }
 
-            var residenceBookData = TencentOCRTools.GetOCR((int)TencentOCR.TencentOCREnum.BizLicense, dto);
+            var residenceBookData = TencentOCRTools.GetOCR((int)TencentOCREnum.BizLicense, dto);
 
             if (residenceBookData.Code != 0)
             {
@@ -250,7 +250,7 @@ namespace OASystem.API.Controllers
                 return Ok(JsonView("图片不能大于7M!"));
             }
 
-            var occData = TencentOCRTools.GetOCR((int)TencentOCR.TencentOCREnum.OrgCodeCert, dto);
+            var occData = TencentOCRTools.GetOCR((int)TencentOCREnum.OrgCodeCert, dto);
 
             if (occData.Code != 0)
             {
@@ -282,7 +282,7 @@ namespace OASystem.API.Controllers
                 return Ok(JsonView("图片不能大于7M!"));
             }
 
-            var vehicleLicenseData = TencentOCRTools.GetOCR((int)TencentOCR.TencentOCREnum.VehicleLicense, dto);
+            var vehicleLicenseData = TencentOCRTools.GetOCR((int)TencentOCREnum.VehicleLicense, dto);
 
             if (vehicleLicenseData.Code != 0)
             {
@@ -313,7 +313,7 @@ namespace OASystem.API.Controllers
                 return Ok(JsonView("图片不能大于7M!"));
             }
 
-            var pcData = TencentOCRTools.GetOCR((int)TencentOCR.TencentOCREnum.PropOwnerCert, dto);
+            var pcData = TencentOCRTools.GetOCR((int)TencentOCREnum.PropOwnerCert, dto);
 
             if (pcData.Code != 0)
             {
@@ -344,7 +344,7 @@ namespace OASystem.API.Controllers
                 return Ok(JsonView("图片不能大于7M!"));
             }
 
-            var mlData = TencentOCRTools.GetOCR((int)TencentOCR.TencentOCREnum.GeneralBasic, dto);
+            var mlData = TencentOCRTools.GetOCR((int)TencentOCREnum.GeneralBasic, dto);
 
             if (mlData.Code != 0)
             {
@@ -375,7 +375,7 @@ namespace OASystem.API.Controllers
                 return Ok(JsonView("图片不能大于7M!"));
             }
 
-            var gbData = TencentOCRTools.GetOCR((int)TencentOCR.TencentOCREnum.GeneralBasic, dto);
+            var gbData = TencentOCRTools.GetOCR((int)TencentOCREnum.GeneralBasic, dto);
 
             if (gbData.Code != 0)
             {
@@ -406,7 +406,7 @@ namespace OASystem.API.Controllers
                 return Ok(JsonView("图片不能大于7M!"));
             }
 
-            var pData = TencentOCRTools.GetOCR((int)TencentOCR.TencentOCREnum.Passport, dto);
+            var pData = TencentOCRTools.GetOCR((int)TencentOCREnum.Passport, dto);
 
             if (pData.Code != 0)
             {
@@ -437,7 +437,7 @@ namespace OASystem.API.Controllers
                 return Ok(JsonView("图片不能大于7M!"));
             }
 
-            var mlidpData = TencentOCRTools.GetOCR((int)TencentOCR.TencentOCREnum.MLIDPassport, dto);
+            var mlidpData = TencentOCRTools.GetOCR((int)TencentOCREnum.MLIDPassport, dto);
 
             if (mlidpData.Code != 0)
             {
@@ -468,7 +468,7 @@ namespace OASystem.API.Controllers
                 return Ok(JsonView("图片不能大于7M!"));
             }
 
-            var mlidpData = TencentOCRTools.GetOCR((int)TencentOCR.TencentOCREnum.BusinessCard, dto);
+            var mlidpData = TencentOCRTools.GetOCR((int)TencentOCREnum.BusinessCard, dto);
 
             if (mlidpData.Code != 0)
             {

OASystem/OASystem.Api/appsettings.json

@@ -111,7 +111,11 @@
 
   "WordBaseUrl": "http://132.232.92.186:24/",
   "WordBasePath": "C:/Server/File/OA2023/Office/Word/",
-  "WordFtpPath": "Office/Word/"
+  "WordFtpPath": "Office/Word/",
+
+  "GrpFileBaseUrl": "http://132.232.92.186:24/",
+  "GrpFileBasePath": "C:/Server/File/OA2023/Office/GrpFile/"
+
 
 
 }

OASystem/OASystem.Domain/AutoMappers/_baseMappingProfile.cs

@@ -85,6 +85,9 @@ namespace OASystem.Domain.AutoMappers
             CreateMap<Edit_GrpCreditCardPaymentDto, Grp_CreditCardPayment>();
             #endregion
 
+            #region 团组增减款项
+            CreateMap<DecreasePaymentsOpDto, Grp_DecreasePayments>();
+            #endregion
 
             #endregion
 

OASystem/OASystem.Domain/Dtos/Groups/DecreasePaymentsDto.cs

@@ -17,4 +17,69 @@ namespace OASystem.Domain.Dtos.Groups
     {
         public int DiId { get; set; }
     }
+    /// <summary>
+    /// 团组增减款项操作
+    /// </summary>
+    public class DecreasePaymentsOpDto
+    {
+        /// <summary>
+        /// 操作状态
+        /// 1 添加 
+        /// 2 修改 
+        /// </summary>
+        public int Status { get; set; }
+        public int PayDId { get; set; }
+        /// <summary>
+        /// 费用表示
+        /// </summary>
+        public int OrbitalPrivateTransfer { get; set; }
+        /// <summary>
+        /// 收款方
+        /// </summary>
+        public string Payee { get;set; }
+        /// <summary>
+        /// 编号
+        /// </summary>
+        public int Id { get; set; }
+        /// <summary>
+        /// 团组外键编号
+        /// </summary>
+        public int DiId { get; set; }
+        /// <summary>
+        /// 费用名称
+        /// </summary>
+        public string PriceName { get; set; }
+        /// <summary>
+        /// 费用金额
+        /// </summary>
+        public decimal Price { get; set; }
+
+        /// <summary>
+        /// 费用币种
+        /// </summary>
+        public int Currency { get; set; }
+        /// <summary>
+        /// 附件地址
+        /// </summary>
+        public string FilePath { get; set; }
+        /// <summary>
+        /// 创建者Id
+        /// </summary>
+        public int CreateUserId { get; set; }
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Remark { get; set; }
+    }
+    public class DecreasePaymentsByIdDto
+    {
+        public int Id { get; set; }
+    }
+
+    public class DelFileDto
+    {
+        public string fileName { get; set; }
+
+        public int Id { get; set; }
+    }
 }

OASystem/OASystem.Domain/Entities/Groups/Grp_CreditCardPayment.cs

@@ -191,7 +191,7 @@ namespace OASystem.Domain.Entities.Groups
         /// 费用标识
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
-        public string OrbitalPrivateTransfer { get; set; }
+        public int OrbitalPrivateTransfer { get; set; }
         /// <summary>
         /// 超出预算比例
         /// </summary>

OASystem/OASystem.Domain/Enums/TencentOCREnum.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OASystem.TencentOCR
+namespace OASystem.Domain.Enums
 {
     /// <summary>
     /// ocr 枚举类型
@@ -29,7 +29,7 @@ namespace OASystem.TencentOCR
         /// <summary>
         /// 户口本识别
         /// </summary>
-        ResidenceBooklet=1,
+        ResidenceBooklet = 1,
         /// <summary>
         /// 营业执照识别
         /// </summary>

OASystem/OASystem.Infrastructure/Repositories/Resource/AirTicketResRepository.cs

@@ -29,7 +29,7 @@ using Aspose.Words.Tables;
 using Aspose.Words;
 using System.Reflection;
 
-namespace OASystem.Infrastructure.Repositories.Resource
+namespace OASystem.Infrastructure.Repositories.Groups
 {
     public class AirTicketResRepository : BaseRepository<Grp_AirTicketReservations, Grp_AirTicketReservations>
     {
@@ -44,7 +44,7 @@ namespace OASystem.Infrastructure.Repositories.Resource
             Result result = new Result() { Code = -2, Msg = "未知错误" };
             try
             {
-                Grp_AirTicketReservations grp_AirTicket = _sqlSugar.Queryable<Grp_AirTicketReservations>().First(a=>a.Id==dto.Id && a.IsDel==0);
+                Grp_AirTicketReservations grp_AirTicket = _sqlSugar.Queryable<Grp_AirTicketReservations>().First(a => a.Id == dto.Id && a.IsDel == 0);
                 if (grp_AirTicket == null)
                 {
                     return result = new Result() { Code = -1, Msg = "暂无数据" };
@@ -53,11 +53,15 @@ namespace OASystem.Infrastructure.Repositories.Resource
                 {
                     Grp_CreditCardPayment grp_CreditCard = _sqlSugar.Queryable<Grp_CreditCardPayment>().First(a => a.CId == grp_AirTicket.Id && a.IsDel == 0);
                     if (grp_CreditCard == null) { return result = new Result() { Code = -1, Msg = "暂无数据" }; }
-                    return result = new Result() { Code = 0, Msg = "查询成功！",Data=new
+                    return result = new Result()
                     {
-                        AirTicket= grp_AirTicket,
-                        CreditCard= grp_CreditCard,
-                    }
+                        Code = 0,
+                        Msg = "查询成功！",
+                        Data = new
+                        {
+                            AirTicket = grp_AirTicket,
+                            CreditCard = grp_CreditCard,
+                        }
                     };
                 }
             }
@@ -235,7 +239,7 @@ namespace OASystem.Infrastructure.Repositories.Resource
             {
                 #region 团组下拉框
 
-                
+
                 List<Grp_GroupsTaskAssignment> grp_GroupsTaskAssignment = Query<Grp_GroupsTaskAssignment>(a => a.IsDel == 0 && a.UId == dto.UserId && a.CTId == 85).ToList();
 
                 string DiId = "";
@@ -262,7 +266,7 @@ namespace OASystem.Infrastructure.Repositories.Resource
 
                 #region 其他下拉框查询
                 //舱位类型
-                List<Sys_SetData> TicketClass = _sqlSugar.Queryable<Sys_SetData>().Where(a=>a.STid==44 && a.IsDel==0).ToList();
+                List<Sys_SetData> TicketClass = _sqlSugar.Queryable<Sys_SetData>().Where(a => a.STid == 44 && a.IsDel == 0).ToList();
                 List<SetDataInfoView> _TicketClassa = _mapper.Map<List<SetDataInfoView>>(TicketClass);
                 //支付方式
                 List<Sys_SetData> Payment = _sqlSugar.Queryable<Sys_SetData>().Where(a => a.STid == 14 && a.IsDel == 0).ToList();
@@ -271,7 +275,7 @@ namespace OASystem.Infrastructure.Repositories.Resource
                 List<Sys_SetData> CardType = _sqlSugar.Queryable<Sys_SetData>().Where(a => a.STid == 15 && a.IsDel == 0).ToList();
                 List<SetDataInfoView> _CardType = _mapper.Map<List<SetDataInfoView>>(CardType);
                 //合作方资料
-                List<Res_AirTicketAgent> _AirTicketAgents = _sqlSugar.Queryable<Res_AirTicketAgent>().Where(a=>a.IsDel == 0).ToList();
+                List<Res_AirTicketAgent> _AirTicketAgents = _sqlSugar.Queryable<Res_AirTicketAgent>().Where(a => a.IsDel == 0).ToList();
 
                 #endregion
                 var data = new
@@ -280,9 +284,9 @@ namespace OASystem.Infrastructure.Repositories.Resource
                     Payment = _Payment,
                     CardType = _CardType,
                     GroupName = grp_NameView,
-                    AirTicketAgents= _AirTicketAgents
+                    AirTicketAgents = _AirTicketAgents
                 };
-                return result = new Result() { Code = 0, Msg = "查询成功！", Data=data };
+                return result = new Result() { Code = 0, Msg = "查询成功！", Data = data };
             }
             catch (Exception ex)
             {
@@ -299,7 +303,7 @@ namespace OASystem.Infrastructure.Repositories.Resource
                 BeginTran();
                 int id = 0;
                 Grp_AirTicketReservations grp_AirTicket = _mapper.Map<Grp_AirTicketReservations>(dto.AirTicketResOpData);
-                if (dto.Status==1)
+                if (dto.Status == 1)
                 {
                     string selectSql = string.Format(@"select * from Grp_AirTicketReservations where ClientName='{0}' and IsDel={1}"
                                                      , dto.AirTicketResOpData.ClientName, 0);
@@ -310,7 +314,7 @@ namespace OASystem.Infrastructure.Repositories.Resource
                     }
                     else//不存在，可添加
                     {
-                       
+
                         id = await AddAsyncReturnId(grp_AirTicket);
                         if (id == 0)
                         {
@@ -321,14 +325,14 @@ namespace OASystem.Infrastructure.Repositories.Resource
                         {
                             result = new Result() { Code = 0, Msg = "添加成功！" };
                         }
-                        
+
                     }
-                    if (result.Code==0)
+                    if (result.Code == 0)
                     {
                         Grp_CreditCardPayment grp_CreditCard = _mapper.Map<Grp_CreditCardPayment>(dto.CardPaymentOpData);
                         //换算
-                        Grp_TeamRate _TeamRate = _sqlSugar.Queryable<Grp_TeamRate>().First(a => a.DiId == grp_AirTicket.DIId && a.IsDel == 0 && a.CTable==85);
-                        if (_TeamRate!=null)
+                        Grp_TeamRate _TeamRate = _sqlSugar.Queryable<Grp_TeamRate>().First(a => a.DiId == grp_AirTicket.DIId && a.IsDel == 0 && a.CTable == 85);
+                        if (_TeamRate != null)
                         {
                             if (grp_CreditCard.PaymentCurrency == 49)
                             {
@@ -353,12 +357,12 @@ namespace OASystem.Infrastructure.Repositories.Resource
                             grp_CreditCard.DayRate = "1";
                             grp_CreditCard.RMBPrice = grp_CreditCard.PayMoney;
                         }
-                        
+
                         //判断是否超出成本
-                        Grp_GroupCostParameter _GroupCostParameter = _sqlSugar.Queryable<Grp_GroupCostParameter>().First(a => a.DiId == grp_AirTicket.DIId && a.IsDel==0);
-                        if (grp_AirTicket.CType==460)//经济舱
+                        Grp_GroupCostParameter _GroupCostParameter = _sqlSugar.Queryable<Grp_GroupCostParameter>().First(a => a.DiId == grp_AirTicket.DIId && a.IsDel == 0);
+                        if (grp_AirTicket.CType == 460)//经济舱
                         {
-                            if((Convert.ToDecimal(_GroupCostParameter.JJCCB)* Convert.ToDecimal(grp_AirTicket.ClientNum))> grp_CreditCard.RMBPrice)
+                            if (Convert.ToDecimal(_GroupCostParameter.JJCCB) * Convert.ToDecimal(grp_AirTicket.ClientNum) > grp_CreditCard.RMBPrice)
                             {
                                 grp_CreditCard.ExceedBudget = 0;// 超出预算比例 换算
                                 grp_CreditCard.IsAuditGM = 3;//3 为自动审核
@@ -373,14 +377,14 @@ namespace OASystem.Infrastructure.Repositories.Resource
                                 grp_CreditCard.ExceedBudget = b;// 超出预算比例 换算
                                 grp_CreditCard.IsAuditGM = 0;//3 为自动审核
                                 grp_CreditCard.AuditGMOperate = 21;
-                                grp_CreditCard.AuditGMDate =new DateTime();
+                                grp_CreditCard.AuditGMDate = new DateTime();
                                 grp_CreditCard.IsPay = 1;
                             }
-                            
+
                         }
-                        else if(grp_AirTicket.CType==458)
+                        else if (grp_AirTicket.CType == 458)
                         {
-                            if ((Convert.ToDecimal(_GroupCostParameter.GWCB) * Convert.ToDecimal(grp_AirTicket.ClientNum)) > grp_CreditCard.RMBPrice)
+                            if (Convert.ToDecimal(_GroupCostParameter.GWCB) * Convert.ToDecimal(grp_AirTicket.ClientNum) > grp_CreditCard.RMBPrice)
                             {
                                 grp_CreditCard.ExceedBudget = 0;// 超出预算比例 换算
                                 grp_CreditCard.IsAuditGM = 3;//3 为自动审核
@@ -399,13 +403,13 @@ namespace OASystem.Infrastructure.Repositories.Resource
                                 grp_CreditCard.IsPay = 1;
                             }
                         }
-                       
+
 
                         grp_CreditCard.CId = id;
                         grp_CreditCard.CTable = 85;
                         grp_CreditCard.PayPercentage = 100;
                         //查询上一次付款信息
-                        Grp_CreditCardPayment _CreditCardPayment = _sqlSugar.Queryable<Grp_CreditCardPayment>().OrderByDescending(x=>x.CreateUserId).First(a => a.DIId == grp_AirTicket.DIId && a.IsDel == 0 && a.IsPay==1);
+                        Grp_CreditCardPayment _CreditCardPayment = _sqlSugar.Queryable<Grp_CreditCardPayment>().OrderByDescending(x => x.CreateUserId).First(a => a.DIId == grp_AirTicket.DIId && a.IsDel == 0 && a.IsPay == 1);
                         if (_CreditCardPayment != null)
                         {
                             grp_CreditCard.PayPercentageOld = _CreditCardPayment.PayPercentageOld;// 上次付款百分比 查询并计算最近一次
@@ -414,17 +418,17 @@ namespace OASystem.Infrastructure.Repositories.Resource
                         }
                         else
                         {
-                            grp_CreditCard.PayPercentageOld =0;// 上次付款百分比 查询并计算最近一次
-                            grp_CreditCard.PayThenMoneyOld =0;// 上次付款金额 查询上一次
-                            grp_CreditCard.UpdateDate =new DateTime();// 上次付款时间 查询上一次
+                            grp_CreditCard.PayPercentageOld = 0;// 上次付款百分比 查询并计算最近一次
+                            grp_CreditCard.PayThenMoneyOld = 0;// 上次付款金额 查询上一次
+                            grp_CreditCard.UpdateDate = new DateTime();// 上次付款时间 查询上一次
                         }
-                        
+
                         id = await _sqlSugar.Insertable(grp_CreditCard).ExecuteReturnIdentityAsync();
                         if (id == 0)
                         {
                             RollbackTran();
                             return result = new Result() { Code = -1, Msg = "添加失败！" };
-                            
+
                         }
                         CommitTran();
                         return result = new Result() { Code = 0, Msg = "添加成功！" };
@@ -434,10 +438,10 @@ namespace OASystem.Infrastructure.Repositories.Resource
                     {
                         RollbackTran();
                         return result = new Result() { Code = -1, Msg = "添加失败！" };
-                        
+
                     }
                 }
-                else if (dto.Status==2) 
+                else if (dto.Status == 2)
                 {
                     id = dto.AirTicketResOpData.Id;
 
@@ -466,8 +470,8 @@ namespace OASystem.Infrastructure.Repositories.Resource
                         result = new Result() { Code = -1, Msg = "修改失败！" };
                     }
                     else { result = new Result() { Code = 0, Msg = "修改成功！" }; }
-                    
-                    if (result.Code==0)
+
+                    if (result.Code == 0)
                     {
                         //C表操作
                         Grp_CreditCardPayment grp_CreditCard = _mapper.Map<Grp_CreditCardPayment>(dto.CardPaymentOpData);
@@ -504,7 +508,7 @@ namespace OASystem.Infrastructure.Repositories.Resource
                         Grp_GroupCostParameter _GroupCostParameter = _sqlSugar.Queryable<Grp_GroupCostParameter>().First(a => a.DiId == grp_AirTicket.DIId && a.IsDel == 0);
                         if (grp_AirTicket.CType == 460)//经济舱
                         {
-                            if ((Convert.ToDecimal(_GroupCostParameter.JJCCB) * Convert.ToDecimal(grp_AirTicket.ClientNum)) > grp_CreditCard.RMBPrice)
+                            if (Convert.ToDecimal(_GroupCostParameter.JJCCB) * Convert.ToDecimal(grp_AirTicket.ClientNum) > grp_CreditCard.RMBPrice)
                             {
                                 grp_CreditCard.ExceedBudget = 0;// 超出预算比例 换算
                                 grp_CreditCard.IsAuditGM = 3;//3 为自动审核
@@ -526,7 +530,7 @@ namespace OASystem.Infrastructure.Repositories.Resource
                         }
                         else if (grp_AirTicket.CType == 458)
                         {
-                            if ((Convert.ToDecimal(_GroupCostParameter.GWCCB) * Convert.ToDecimal(grp_AirTicket.ClientNum)) > grp_CreditCard.RMBPrice)
+                            if (Convert.ToDecimal(_GroupCostParameter.GWCCB) * Convert.ToDecimal(grp_AirTicket.ClientNum) > grp_CreditCard.RMBPrice)
                             {
                                 grp_CreditCard.ExceedBudget = 0;// 超出预算比例 换算
                                 grp_CreditCard.IsAuditGM = 3;//3 为自动审核
@@ -564,7 +568,7 @@ namespace OASystem.Infrastructure.Repositories.Resource
                             grp_CreditCard.PayThenMoneyOld = 0;// 上次付款金额 查询上一次
                             grp_CreditCard.UpdateDate = new DateTime();// 上次付款时间 查询上一次
                         }
-                        int CTable=await _sqlSugar.Updateable<Grp_CreditCardPayment>().Where(a => a.Id == dto.CardPaymentOpData.Id).SetColumns(a => new Grp_CreditCardPayment
+                        int CTable = await _sqlSugar.Updateable<Grp_CreditCardPayment>().Where(a => a.Id == dto.CardPaymentOpData.Id).SetColumns(a => new Grp_CreditCardPayment
                         {
                             PayDId = grp_CreditCard.PayDId,
                             ConsumptionPatterns = grp_CreditCard.ConsumptionPatterns,
@@ -638,12 +642,12 @@ namespace OASystem.Infrastructure.Repositories.Resource
                                 c.Payee,a.PriceDescription,(select Name from Sys_SetData where Id=a.Currency) as 'CurrencyStr',(select Name from Sys_SetData where Id=c.CTDId) as BankType
                                 from Grp_AirTicketReservations a,Grp_CreditCardPayment c ,Grp_DelegationInfo d where  a.id=c.CId and d.Id=a.DIId  and a.isdel=0
                                 and a.DIId={0} Order By a.CreateTime desc", dto.DiId, 0);
-                List<AirTicketReservationsPayView>  _AirTicketReservations = _sqlSugar.SqlQueryable<AirTicketReservationsPayView>(sql).ToList();
+                List<AirTicketReservationsPayView> _AirTicketReservations = _sqlSugar.SqlQueryable<AirTicketReservationsPayView>(sql).ToList();
                 if (_AirTicketReservations.Count != 0)
                 {
-                    Grp_DelegationInfo grp_Delegation =_sqlSugar.Queryable<Grp_DelegationInfo>().First(a => a.Id ==dto.DiId && a.IsDel==0);
-                    Sys_Users _Users= _sqlSugar.Queryable<Sys_Users>().First(a => a.Id ==dto.UserId && a.IsDel == 0);
-                    return result = new Result() { Code = 0, Msg = "成功", Data = new { Delegation = grp_Delegation, AirTicketRes = _AirTicketReservations, Users=_Users } };
+                    Grp_DelegationInfo grp_Delegation = _sqlSugar.Queryable<Grp_DelegationInfo>().First(a => a.Id == dto.DiId && a.IsDel == 0);
+                    Sys_Users _Users = _sqlSugar.Queryable<Sys_Users>().First(a => a.Id == dto.UserId && a.IsDel == 0);
+                    return result = new Result() { Code = 0, Msg = "成功", Data = new { Delegation = grp_Delegation, AirTicketRes = _AirTicketReservations, Users = _Users } };
                 }
                 else
                 {
@@ -666,7 +670,7 @@ namespace OASystem.Infrastructure.Repositories.Resource
                                                 as 'CurrencyStr' from Grp_AirTicketReservations a,Grp_CreditCardPayment c where  a.id=c.CId  and a.isdel={1}
                                                 and a.DIId={0} Order By a.CreateTime desc", dto.DiId, 0);
                 List<AirTicketReservationsView> _AirTicketReservations = _sqlSugar.SqlQueryable<AirTicketReservationsView>(sql).ToList();
-                if (_AirTicketReservations.Count==0)
+                if (_AirTicketReservations.Count == 0)
                 {
                     return result = new Result() { Code = -1, Msg = "暂无数据", Data = null };
                 }
@@ -705,7 +709,7 @@ namespace OASystem.Infrastructure.Repositories.Resource
                 Qtext = Qtext.Substring(0, Qtext.Length - 1);
             }
 
-            Dictionary<String, String> dic = new Dictionary<String, String>();
+            Dictionary<string, string> dic = new Dictionary<string, string>();
 
             string url = "https://openapi.youdao.com/v2/api";
 
@@ -776,7 +780,7 @@ namespace OASystem.Infrastructure.Repositories.Resource
             }
             return result;
         }
-        protected string TransSync(string url, Dictionary<String, String> dic)
+        protected string TransSync(string url, Dictionary<string, string> dic)
         {
             string result = "";
             HttpWebRequest req = (HttpWebRequest)WebRequest.Create(url);
@@ -833,7 +837,7 @@ namespace OASystem.Infrastructure.Repositories.Resource
             {
                 if (File.Exists(FilePath))
                     File.Delete(FilePath);
-                Stream outStream =File.Create(FilePath);
+                Stream outStream = File.Create(FilePath);
                 Stream inStream = response.GetResponseStream();
 
                 int l;
@@ -856,8 +860,8 @@ namespace OASystem.Infrastructure.Repositories.Resource
         }
         protected static string ComputeHash(string input, HashAlgorithm algorithm)
         {
-            Byte[] inputBytes = Encoding.UTF8.GetBytes(input);
-            Byte[] hashedBytes = algorithm.ComputeHash(inputBytes);
+            byte[] inputBytes = Encoding.UTF8.GetBytes(input);
+            byte[] hashedBytes = algorithm.ComputeHash(inputBytes);
             return BitConverter.ToString(hashedBytes).Replace("-", "");
         }
         protected static string Truncate(string q)
@@ -867,7 +871,7 @@ namespace OASystem.Infrastructure.Repositories.Resource
                 return null;
             }
             int len = q.Length;
-            return len <= 20 ? q : (q.Substring(0, 10) + len + q.Substring(len - 10, 10));
+            return len <= 20 ? q : q.Substring(0, 10) + len + q.Substring(len - 10, 10);
         }
         public static DateTime GetBeijingTime()
         {
@@ -913,7 +917,7 @@ namespace OASystem.Infrastructure.Repositories.Resource
 
         }
 
-       
+
 
         public class TranslateResult
         {
@@ -924,7 +928,7 @@ namespace OASystem.Infrastructure.Repositories.Resource
             public string Type { get; set; }
 
             public string VerifyResult { get; set; }
-        
+
+        }
     }
 }
-}

OASystem/OASystem.Infrastructure/Repositories/Groups/DecreasePaymentsRepository.cs

@@ -8,6 +8,7 @@ using OASystem.Infrastructure.Repositories.System;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Runtime.Intrinsics.Arm;
 using System.Text;
 using System.Threading.Tasks;
 
@@ -32,11 +33,11 @@ namespace OASystem.Infrastructure.Repositories.Groups
             {
                 string sql = string.Format(@"select Id,DiId,PriceName,Price,(select name from Sys_SetData where id=s.Currency) as Currency,FilePath,
                                             (select CnName from Sys_Users where Id=s.CreateUserId) as 'CreateUserName',CreateTime,(select IsAuditGM from 
-                                            Grp_CreditCardPayment where CTable=98 and CId=s.Id) as 'isAudit' from Grp_DecreasePayments s where DIID={0} and IsDel=0 ", dto.DiId);
+                                            Grp_CreditCardPayment where CTable=98 and CId=s.Id and IsDel=0) as 'isAudit' from Grp_DecreasePayments s where DIID={0} and IsDel=0 ", dto.DiId);
                 List<DecreasePaymentsView> _DecreasePayments = await _sqlSugar.SqlQueryable<DecreasePaymentsView>(sql).ToListAsync();
                 if (_DecreasePayments.Count != 0)
                 {
-                    result = new Result() { Code = 0, Msg = "查询成功！",Data=_DecreasePayments };
+                    result = new Result() { Code = 0, Msg = "查询成功！", Data = _DecreasePayments };
                 }
                 else
                 {
@@ -75,7 +76,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                 #endregion
 
                 #region 其他下拉框查询
-               
+
                 //支付方式
                 List<Sys_SetData> Payment = _sqlSugar.Queryable<Sys_SetData>().Where(a => a.STid == 14 && a.IsDel == 0).ToList();
                 List<SetDataInfoView> _Payment = _mapper.Map<List<SetDataInfoView>>(Payment);
@@ -93,5 +94,240 @@ namespace OASystem.Infrastructure.Repositories.Groups
                 throw;
             }
         }
+
+        public async Task<Result> OpDecreasePayments(DecreasePaymentsOpDto dto)
+        {
+            Result result = new Result() { Code = -2, Msg = "未知错误" };
+            BeginTran();
+            try
+            {
+                int id = 0;
+                Grp_DecreasePayments grp_Decrease = _mapper.Map<Grp_DecreasePayments>(dto);
+                if (dto.Status == 1)//添加
+                {
+                    string selectSql = string.Format(@"select * from Grp_DecreasePayments where PriceName='{0}' and IsDel={1} and DiId={2}"
+                                                    , dto.PriceName, 0, dto.DiId);
+                    var DecreasePayments = await _sqlSugar.SqlQueryable<Grp_DecreasePayments>(selectSql).FirstAsync();//查询是否存在
+                    if (DecreasePayments != null)
+                    {
+                        return result = new Result() { Code = -1, Msg = "该客户已存在，请勿重复添加！" };
+                    }
+                    else//不存在，可添加
+                    {
+
+                        id = await AddAsyncReturnId(grp_Decrease);
+                        if (id != 0)
+                        {
+                            result = new Result() { Code = 0, Msg = "添加成功！" };
+                        }
+                        else
+                        {
+                            result = new Result() { Code = 0, Msg = "添加失败！" };
+                        }
+                        if (result.Code == 0)
+                        {
+                            //进行C表添加
+                            Grp_CreditCardPayment C = new Grp_CreditCardPayment();
+                            C.PayDId = dto.PayDId;
+                            C.ConsumptionPatterns = "";
+                            C.ConsumptionDate = new DateTime();
+                            C.CTDId = 0;
+                            C.BankNo = "";
+                            C.CardholderName = "";
+                            C.PayMoney = grp_Decrease.Price;
+                            C.PaymentCurrency = grp_Decrease.Currency;
+                            //当天汇率
+                            //if (!string.IsNullOrEmpty(hfRate.Value))
+                            //    C.DayRate = hfRate.Value;
+                            //else
+                            //C.DayRate = "";
+                            C.CompanyBankNo = "";
+                            C.OtherBankName = "";
+                            C.OtherSideNo = "";
+                            C.OtherSideName = "";
+                            C.Remark = "";
+                            C.CreateUserId = grp_Decrease.CreateUserId;
+                            C.MFOperator = "";
+                            C.MFOperatorDate = new DateTime();
+                            C.IsAuditDM = 0;
+                            C.AuditDMOperate = 0;
+                            C.AuditDMDate = new DateTime();
+                            C.IsAuditMF = 0;
+                            C.AuditMFOperate = 0;
+                            C.AuditMFDate = new DateTime();
+                            C.IsAuditGM = 0;
+                            C.AuditGMOperate = 21;
+                            C.AuditGMDate = new DateTime();
+                            C.IsPay = 0;
+                            C.DIId = grp_Decrease.DiId;
+                            C.CId = id;
+                            C.CTable = 98;
+                            C.PayPercentage = 0;
+                            C.PayThenMoney = 0;
+                            C.PayPercentageOld = 0;
+                            C.PayThenMoneyOld = 0;
+                            C.UpdateDate = new DateTime();
+                            C.Payee = dto.Payee;
+                            C.OrbitalPrivateTransfer = dto.OrbitalPrivateTransfer;
+                            C.ExceedBudget = 0;
+                            //C.RMBPrice = 0.00f;
+
+                            //设置该团组的汇率
+                            Grp_TeamRate _TeamRate = _sqlSugar.Queryable<Grp_TeamRate>().First(a => a.DiId == grp_Decrease.DiId && a.IsDel == 0 && a.CTable == 85);
+                            if (_TeamRate != null)
+                            {
+                                if (grp_Decrease.Currency == 49)
+                                {
+                                    C.DayRate = _TeamRate.RateU;
+                                    C.RMBPrice = C.PayMoney * Convert.ToDecimal(_TeamRate.RateU);
+                                    //ccp.PayMoney = ccp.PayMoney * float.Parse(tr.RateU); 
+                                }
+                                else if (grp_Decrease.Currency == 51)
+                                {
+                                    C.DayRate = _TeamRate.RateE;
+                                    C.RMBPrice = C.PayMoney * Convert.ToDecimal(_TeamRate.RateE);
+                                    //ccp.PayMoney = ccp.PayMoney * float.Parse(tr.RateE); 
+                                }
+                                else
+                                {
+                                    C.DayRate = "1";
+                                    C.RMBPrice = C.PayMoney;
+                                }
+                            }
+                            else
+                            {
+                                C.DayRate = "1";
+                                C.RMBPrice = C.PayMoney;
+                            }
+                            int cId = await _sqlSugar.Insertable(C).ExecuteReturnIdentityAsync();
+                            if (cId != 0)
+                            {
+                                result = new Result() { Code = 0, Msg = "添加成功！" };
+                            }
+                            else
+                            {
+                                RollbackTran();
+                                result = new Result() { Code = -1, Msg = "添加失败！" };
+                            }
+                        }
+                        else
+                        {
+                            result = new Result() { Code = -1, Msg = "添加失败！" };
+                        }
+                    }
+
+                }
+                else if (dto.Status == 2)
+                {
+                    bool res = await UpdateAsync(a => a.Id == grp_Decrease.Id, a => new Grp_DecreasePayments
+                    {
+                        DiId = grp_Decrease.DiId,
+                        PriceName = grp_Decrease.PriceName,
+                        Price = grp_Decrease.Price,
+                        Currency = grp_Decrease.Currency,
+                        FilePath = grp_Decrease.FilePath,
+                        Remark = grp_Decrease.Remark,
+                    });
+                    if (res)
+                    {
+                        Grp_CreditCardPayment grp_CreditCardPayment = _sqlSugar.Queryable<Grp_CreditCardPayment>().First(a => a.CId == grp_Decrease.Id && a.IsDel == 0);
+                        if (grp_CreditCardPayment != null)
+                        {
+                            Grp_TeamRate _TeamRate = _sqlSugar.Queryable<Grp_TeamRate>().First(a => a.DiId == grp_Decrease.DiId && a.IsDel == 0 && a.CTable == 85);
+                            if (_TeamRate != null)
+                            {
+
+                                if (grp_Decrease.Currency == 49)
+                                {
+                                    grp_CreditCardPayment.DayRate = _TeamRate.RateU;
+                                    grp_CreditCardPayment.RMBPrice = grp_Decrease.Price * Convert.ToDecimal(_TeamRate.RateU);
+                                    //ccp.PayMoney = ccp.PayMoney * float.Parse(tr.RateU); 
+                                }
+                                else if (grp_Decrease.Currency == 51)
+                                {
+                                    grp_CreditCardPayment.DayRate = _TeamRate.RateE;
+                                    grp_CreditCardPayment.RMBPrice = grp_Decrease.Price * Convert.ToDecimal(_TeamRate.RateE);
+                                    //ccp.PayMoney = ccp.PayMoney * float.Parse(tr.RateE); 
+                                }
+                                else
+                                {
+                                    grp_CreditCardPayment.DayRate = "1";
+                                    grp_CreditCardPayment.RMBPrice = grp_Decrease.Price;
+                                }
+                            }
+                            else
+                            {
+                                grp_CreditCardPayment.DayRate = "1";
+                                grp_CreditCardPayment.RMBPrice = grp_Decrease.Price;
+                            }
+                            int CTable = await _sqlSugar.Updateable<Grp_CreditCardPayment>().Where(a => a.Id == grp_CreditCardPayment.Id).SetColumns(a => new Grp_CreditCardPayment
+                            {
+                                PayDId = dto.PayDId,
+                                PayMoney = grp_Decrease.Price,
+                                PaymentCurrency = grp_Decrease.Currency,
+                                Payee = dto.Payee,
+                                OrbitalPrivateTransfer = dto.OrbitalPrivateTransfer,
+                                DayRate = grp_CreditCardPayment.DayRate,
+                                RMBPrice = grp_CreditCardPayment.RMBPrice,
+
+                            }).ExecuteCommandAsync();
+                            if (CTable != 0)
+                            {
+                                result = new Result() { Code = 0, Msg = "修改成功！" };
+                            }
+                            else
+                            {
+                                result = new Result() { Code = -1, Msg = "修改失败！" };
+                                RollbackTran();
+                            }
+                        }
+                        else
+                        {
+                            RollbackTran();
+                            result = new Result() { Code = -1, Msg = "修改失败！" };
+                        }
+                    }
+                    else
+                    {
+                        result = new Result() { Code = -1, Msg = "修改失败！" };
+                    }
+                }
+                CommitTran();
+            }
+            catch (Exception ex)
+            {
+                RollbackTran();
+                result = new Result() { Code = -2, Msg = "未知错误" };
+            }
+            return result;
+        }
+
+        /// <summary>
+        /// 根据团组增减款项表Id查询数据
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public async Task<Result> QueryDecreasePaymentsById(DecreasePaymentsByIdDto dto)
+        {
+            Result result = new Result() { Code = -2, Msg = "程序错误" };
+            try
+            {
+                Grp_DecreasePayments grp_Decrease = _sqlSugar.Queryable<Grp_DecreasePayments>().First(a=>a.Id==dto.Id && a.IsDel==0);
+                Grp_CreditCardPayment grp_CreditCard= _sqlSugar.Queryable<Grp_CreditCardPayment>().First(a => a.CId == dto.Id && a.IsDel == 0);
+                var data = new
+                {
+                    _Decrease = grp_Decrease,
+                    _CreditCard = grp_CreditCard,
+                };
+                result = new Result() { Code = 0, Msg = "查询成功！", Data = data };
+            }
+            catch (Exception)
+            {
+                result = new Result() { Code = -2, Msg = "程序错误" };
+                throw;
+            }
+            return result;
+        }
     }
 }

OASystem/OASystem.Infrastructure/Repositories/Resource/AirTicketAgentRepository.cs

@@ -9,7 +9,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OASystem.Infrastructure.Repositories.Resource
+namespace OASystem.Infrastructure.Repositories.Groups
 {
     public class AirTicketAgentRepository : BaseRepository<Res_AirTicketAgent, Res_AirTicketAgent>
     {

OASystem/_Doc/OA2023数据字典.docx

@@ -2917,7 +2917,7 @@ Null
 人民币费用
 
 OrbitalPrivateTransfer
-varchar(20)
+Int
 Null
 
 费用标识