添加op费用填写详细相关接口

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -2959,7 +2959,7 @@ namespace OASystem.API.Controllers
                 List<Sys_SetData> CurrencyList = _sqlSugar.Queryable<Sys_SetData>().Where(a => a.STid == 66 && a.IsDel == 0).ToList();
                 List<SetDataInfoView> _CurrencyList = _mapper.Map<List<SetDataInfoView>>(CurrencyList);
 
-                //支付方式
+                //乘客类型
                 List<Sys_SetData> PassengerType = _sqlSugar.Queryable<Sys_SetData>().Where(a => a.STid == 69 && a.IsDel == 0).ToList();
                 List<SetDataInfoView> _PassengerType = _mapper.Map<List<SetDataInfoView>>(PassengerType);
 
@@ -3043,8 +3043,14 @@ namespace OASystem.API.Controllers
         {
             try
             {
-                Grp_CarTouristGuideGroundReservations groupData = await _sqlSugar.Queryable<Grp_CarTouristGuideGroundReservations>().FirstAsync(a=>a.Id==dto.Id && a.IsDel==0);
-                return Ok(JsonView(true, "查询成功！", groupData));
+                Grp_CarTouristGuideGroundReservations _groupData = await _sqlSugar.Queryable<Grp_CarTouristGuideGroundReservations>().FirstAsync(a=>a.Id==dto.Id && a.IsDel==0);
+                Grp_CreditCardPayment _creditCardPayment = await _sqlSugar.Queryable<Grp_CreditCardPayment>().FirstAsync(a => a.CId == dto.Id && a.CTable==79 && a.IsDel == 0);
+                var data = new
+                {
+                    CarTouristGuideGround = _groupData,
+                    CreditCardPayment = _creditCardPayment
+                };
+                return Ok(JsonView(true, "查询成功！", data));
             }
             catch (Exception ex)
             {
@@ -3111,6 +3117,71 @@ namespace OASystem.API.Controllers
                 return Ok(JsonView(false, ex.Message));
             }
         }
+        /// <summary>
+        /// 填写费用详细页面初始化绑定
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        public async Task<IActionResult> CarTouristGuideGroundContenInitialize(CarTouristGuideGroundContenDto dto)
+        {
+            try
+            {
+                Result groupData = await _carTouristGuideGroundRep.CarTouristGuideGroundConten(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, ex.Message));
+            }
+        }
+        /// <summary>
+        /// 根据op费用Id查询详细数据
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        public async Task<IActionResult> OpCarTouristGuideGroundContenById(CarTouristGuideGroundIdDto dto)
+        {
+            try
+            {
+                Result groupData = await _carTouristGuideGroundRep.OpCarTouristGuideGroundContenById(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, ex.Message));
+            }
+        }
+
+        [HttpPost]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        public async Task<IActionResult> OpCarTouristGuideGroundConten(OpCarTouristGuideGroundContenDto dto)
+        {
+            try
+            {
+                Result groupData = await _carTouristGuideGroundRep.OpCarTouristGuideGroundConten(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, ex.Message));
+            }
+        }
         #endregion
     }
 }

OASystem/OASystem.Domain/Dtos/Groups/CarTouristGuideGroundDto.cs

@@ -83,10 +83,7 @@ namespace OASystem.Domain.Dtos.Groups
         /// 服务描述
         /// </summary>
         public string ServiceDescription { get; set; }
-        /// <summary>
-        /// 报价说明
-        /// </summary>
-        public string QuotedPriceExplanation { get; set; }
+       
         /// <summary>
         /// 公转私转标识
         /// </summary>
@@ -100,4 +97,73 @@ namespace OASystem.Domain.Dtos.Groups
         /// </summary>
         public string Remark { get; set; }
     }
+
+    public class CarTouristGuideGroundContenDto
+    {
+        public int UserId { get; set; }
+    }
+
+    public class OpCarTouristGuideGroundContenDto
+    {
+        /// <summary>
+        /// 团组Id
+        /// </summary>
+        public int DiId { get; set; }
+        /// <summary>
+        /// Op费用Id
+        /// </summary>
+        public int CTGGRId { get; set; }
+        /// <summary>
+        /// 费用表示
+        /// </summary>
+        public int OrbitalPrivateTransfer { get; set; }
+        /// <summary>
+        /// 付款百分百
+        /// </summary>
+        public decimal PayPercentage { get; set; }
+        /// <summary>
+        /// 收款方
+        /// </summary>
+        public string Payee { get; set; }
+        /// <summary>
+        /// 支付方式
+        /// </summary>
+        public int PayDId { get; set; }
+        /// <summary>
+        /// 币种Id
+        /// </summary>
+        public int Currency { get; set; }
+        /// <summary>
+        /// 详情数据
+        /// </summary>
+        public List<OPContenList> OPContenList { get; set; }
+        /// <summary>
+        /// 创建人Id
+        /// </summary>
+        public int CreateUserId { get; set; }
+    }
+    public class OPContenList
+    {
+        
+        /// <summary>
+        /// 费用详细Id
+        /// </summary>
+        public int Id { get; set; }
+        /// <summary>
+        /// 类型名称Id
+        /// </summary>
+        public int SId { get; set; }
+        /// <summary>
+        /// 费用金额
+        /// </summary>
+        public decimal Price { get; set; }
+        /// <summary>
+        /// 费用描述
+        /// </summary>
+        public string priceContent { get; set; }
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Remark { get; set; }
+    }
 }

OASystem/OASystem.Domain/Entities/Groups/Grp_CarTouristGuideGroundReservations.cs

@@ -80,7 +80,6 @@ namespace OASystem.Domain.Entities.Groups
         /// <summary>
         /// 服务报价
         /// </summary>
-        /// 
         [SugarColumn(IsNullable = true, ColumnDataType = "decimal(18,2)")]
         public decimal ServiceQuotedPrice { get; set; }
         /// <summary>

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

@@ -21,6 +21,8 @@ namespace OASystem.Domain.ViewModels.Groups
         /// 此次付款金额
         /// </summary>
         public decimal PayThenMoney { get; set; }
+
+        public decimal PayMoney { get; set; }
         /// <summary>
         /// 剩余尾款
         /// </summary>

OASystem/OASystem.Infrastructure/Repositories/Groups/CarTouristGuideGroundRepository.cs

@@ -1,8 +1,10 @@
 using AutoMapper;
+using NPOI.OpenXmlFormats.Shared;
 using OASystem.Domain;
 using OASystem.Domain.Dtos.Groups;
 using OASystem.Domain.Entities.Financial;
 using OASystem.Domain.Entities.Groups;
+using OASystem.Domain.Entities.Resource;
 using OASystem.Domain.ViewModels.Groups;
 using OASystem.Infrastructure.Tools;
 using System;
@@ -29,87 +31,86 @@ namespace OASystem.Infrastructure.Repositories.Groups
             BeginTran();
             try
             {
-                //int id = 0;
-                //Grp_CarTouristGuideGroundReservations grp_CarTouristGuide = _mapper.Map<Grp_CarTouristGuideGroundReservations>(dto);
-                //if (dto.Status == 1)//添加
-                //{
-                //    Grp_CarTouristGuideGroundReservations grp_CarTouristGuideGround = _sqlSugar.Queryable<Grp_CarTouristGuideGroundReservations>().First(a => a.IsDel == 0 && a.Area == dto.Area && a.BusName == dto.BusName && a.ServiceGuide == dto.ServiceGuide);
-                //    if (grp_CarTouristGuideGround != null)
-                //    {
-                //        return result = new Result() { Code = -1, Msg = "该笔费用已存在，请勿重复添加！" };
-                //    }
-                //    else
-                //    {
-                //        id = await AddAsyncReturnId(grp_CarTouristGuide);
-                //        if (id != 0)
-                //        {
-                //            //int cId = await _sqlSugar.Insertable(c).ExecuteReturnIdentityAsync();
-                //            if (true)
-                //            {
-                //                result = new Result() { Code = 0, Msg = "添加成功！" };
-
-                //            }
-                //            else
-                //            {
-                //                RollbackTran();
-                //                result = new Result() { Code = -1, Msg = "添加失败！" };
-                //            }
-                //        }
-                //        else
-                //        {
-                //            RollbackTran();
-                //            result = new Result() { Code = -1, Msg = "添加失败，请稍后重试！" };
-                //        }
-                //    }
-
-                //}
-                //else if (dto.Status == 2)//修改
-                //{
-
-                //    bool res = await UpdateAsync(a => a.Id == dto.Id, a => new Grp_VisaInfo
-                //    {
-                //        VisaClient = grp_Visa1.VisaClient,
-                //        VisaPrice = grp_Visa1.VisaPrice,
-                //        VisaCurrency = grp_Visa1.VisaCurrency,
-                //        IsThird = grp_Visa1.IsThird,
-                //        PassengerType = grp_Visa1.PassengerType,
-                //        VisaNumber = grp_Visa1.VisaNumber,
-                //        VisaFreeNumber = grp_Visa1.VisaFreeNumber,
-                //        Remark = dto.Remark,
-                //    });
-                //    if (res)
-                //    {
-                //        int CTable = await _sqlSugar.Updateable<Grp_CreditCardPayment>().Where(a => a.CId == grp_Visa1.Id && a.CTable == 80).SetColumns(a => new Grp_CreditCardPayment
-                //        {
-                //            PayDId = dto.PayDId,
-                //            PayMoney = c.PayMoney,
-                //            PaymentCurrency = c.PaymentCurrency,
-                //            Payee = c.Payee,
-                //            OrbitalPrivateTransfer = c.OrbitalPrivateTransfer,
-                //            DayRate = c.DayRate,
-                //            RMBPrice = c.RMBPrice,
-                //            ConsumptionPatterns = c.ConsumptionPatterns,
-                //            ConsumptionDate = c.ConsumptionDate,
-                //            CTDId = c.CTDId,
-                //            CompanyBankNo = c.CompanyBankNo,
-                //            OtherBankName = c.OtherBankName,
-                //            OtherSideNo = c.OtherSideNo,
-                //            OtherSideName = c.OtherSideName,
-                //            BankNo = c.BankNo,
-                //            CardholderName = c.CardholderName,
-                //            Remark = c.Remark,
-
-                //        }).ExecuteCommandAsync();
-
-                //        result = new Result() { Code = 0, Msg = "修改成功！" };
-                //    }
-                //    else
-                //    {
-                //        RollbackTran();
-                //        result = new Result() { Code = -1, Msg = "修改失败，请稍后重试！" };
-                //    }
-                //}
-                //CommitTran();
+                int id = 0;
+                Grp_CarTouristGuideGroundReservations grp_CarTouristGuide = _mapper.Map<Grp_CarTouristGuideGroundReservations>(dto);
+                if (dto.Status == 1)//添加
+                {
+                    Grp_CarTouristGuideGroundReservations grp_CarTouristGuideGround = _sqlSugar.Queryable<Grp_CarTouristGuideGroundReservations>().First(a => a.IsDel == 0 && a.Area == dto.Area && a.BusName == dto.BusName && a.ServiceGuide == dto.ServiceGuide && a.DiId==dto.DiId && a.BusTel==dto.BusTel && a.ServiceTel==dto.ServiceTel);
+                    if (grp_CarTouristGuideGround != null)
+                    {
+                        return result = new Result() { Code = -1, Msg = "该笔费用已存在，请勿重复添加！" };
+                    }
+                    else
+                    {
+                        id = await AddAsyncReturnId(grp_CarTouristGuide);
+                        if (id == 0)
+                        {
+                            RollbackTran();
+                            result = new Result() { Code = -1, Msg = "添加失败，请稍后重试！" };
+                        }
+                        else
+                        {
+                            result = new Result() { Code = 0, Msg = "添加成功！" };
+                        }
+
+                    }
+
+                }
+                else if (dto.Status == 2)//修改
+                {
+
+                    bool res = await UpdateAsync(a => a.Id == dto.Id, a => new Grp_CarTouristGuideGroundReservations
+                    {
+                        Area = grp_CarTouristGuide.Area,
+                        ServiceCompany = grp_CarTouristGuide.ServiceCompany,
+                        ServiceGuide = grp_CarTouristGuide.ServiceGuide,
+                        ServiceTel = grp_CarTouristGuide.ServiceTel,
+                        BusName = grp_CarTouristGuide.BusName,
+                        BusDescription = grp_CarTouristGuide.BusDescription,
+                        BusTel = grp_CarTouristGuide.BusTel,
+                        ServiceStartTime = grp_CarTouristGuide.ServiceStartTime,
+                        ServiceEndTime = grp_CarTouristGuide.ServiceEndTime,
+                        ServiceDescription = grp_CarTouristGuide.ServiceDescription,
+                        QuotedPriceExplanation = grp_CarTouristGuide.QuotedPriceExplanation,
+                        OrbitalPrivateTransfer = grp_CarTouristGuide.OrbitalPrivateTransfer,
+                        Remark = grp_CarTouristGuide.Remark,
+                    });
+                    if (res)
+                    {
+                        id = dto.Id;
+                        result = new Result() { Code = 0, Msg = "修改成功！" };
+                    }
+                    else
+                    {
+                        RollbackTran();
+                        result = new Result() { Code = -1, Msg = "修改失败，请稍后重试！" };
+                    }
+                }
+                if (id!=0)
+                {
+                    Res_LocalGuideData _LocalGuideDataCar = _sqlSugar.Queryable<Res_LocalGuideData>().First(a => a.UnitName == dto.BusName && a.ContactTel == dto.BusTel && a.IsDel == 0);
+                    if (_LocalGuideDataCar == null)
+                    {
+                        Res_LocalGuideData res_LocalGuideCar = new Res_LocalGuideData();
+                        res_LocalGuideCar.UnitName = dto.BusName;
+                        res_LocalGuideCar.ContactTel = dto.BusTel;
+                        res_LocalGuideCar.CreateUserId = dto.CreateUserId;
+                        int cId = await _sqlSugar.Insertable(res_LocalGuideCar).ExecuteReturnIdentityAsync();
+                    }
+                    Res_LocalGuideData _LocalGuideDataService = _sqlSugar.Queryable<Res_LocalGuideData>().First(a => a.UnitName == dto.ServiceCompany && a.ContactTel == dto.ServiceTel && a.IsDel == 0);
+                    if (_LocalGuideDataService == null)
+                    {
+                        Res_LocalGuideData res_LocalGuideService = new Res_LocalGuideData();
+                        res_LocalGuideService.UnitName = dto.ServiceCompany;
+
+                        res_LocalGuideService.ContactTel = dto.ServiceTel;
+                        res_LocalGuideService.Contact = dto.ServiceTel;
+                        res_LocalGuideService.CreateUserId = dto.CreateUserId;
+                        int cId = await _sqlSugar.Insertable(res_LocalGuideService).ExecuteReturnIdentityAsync();
+                    }
+                }
+                
+                CommitTran();
             }
             catch (Exception ex)
             {
@@ -118,6 +119,85 @@ namespace OASystem.Infrastructure.Repositories.Groups
             return result;
         }
 
+        public async Task<Result> CarTouristGuideGroundConten(CarTouristGuideGroundContenDto dto)
+        {
+            Result result = new Result() { Code = -2, Msg = "未知错误" };
+            try
+            {
+                List<Grp_GroupsTaskAssignment> grp_GroupsTaskAssignment = Query<Grp_GroupsTaskAssignment>(a => a.IsDel == 0 && a.UId == dto.UserId && a.CTId == 79).ToList();
+
+                string DiId = "0";
+                foreach (var item in grp_GroupsTaskAssignment)
+                {
+                    DiId += item.DIId + ",";
+                }
+                if (DiId != "0")
+                {
+                    DiId = DiId.Substring(0, DiId.Length - 1);
+                }
+                string sql = string.Format(@"select * from Grp_DelegationInfo where Id in({0}) and IsDel={1}", DiId, 0);
+
+                //团组下拉框
+                List<Grp_DelegationInfo> grp_Delegations = _sqlSugar.SqlQueryable<Grp_DelegationInfo>(sql).ToList();
+                //支付方式
+                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);
+
+                //币种
+                List<Sys_SetData> CurrencyList = _sqlSugar.Queryable<Sys_SetData>().Where(a => a.STid == 66 && a.IsDel == 0).ToList();
+                List<SetDataInfoView> _CurrencyList = _mapper.Map<List<SetDataInfoView>>(CurrencyList);
+
+                //列表初始化
+                List<Sys_SetData> TableInitialization = _sqlSugar.Queryable<Sys_SetData>().Where(a => a.STid == 17 && a.IsDel == 0).ToList();
+                List<SetDataInfoView> _TableInitialization = _mapper.Map<List<SetDataInfoView>>(TableInitialization);
+                _TableInitialization= _TableInitialization.OrderBy(a=>a.Name).ToList();
+
+                var data = new
+                {
+                    Payment = _Payment,
+                    CurrencyList = _CurrencyList,
+                    Delegations = grp_Delegations,
+                    TableInitialization = _TableInitialization
+                };
+                return result = new Result() { Code = 0, Msg = "查询成功",Data=data };
+
+            }
+            catch (Exception)
+            {
+                return result = new Result() { Code = -2, Msg = "未知错误" };
+                throw;
+            }
+        }
+
+        public async Task<Result> OpCarTouristGuideGroundContenById(CarTouristGuideGroundIdDto dto)
+        {
+            Result result = new Result() { Code = -2, Msg = "未知错误" };
+            try
+            {
+               
+                List<Grp_CarTouristGuideGroundReservationsContent> grp_CarTouristsConten = _sqlSugar.Queryable<Grp_CarTouristGuideGroundReservationsContent>().Where(a=>a.IsDel==0 && a.CTGGRId==dto.Id).ToList();
+                Grp_CreditCardPayment _CreditCardPayment = _sqlSugar.Queryable<Grp_CreditCardPayment>().First(a => a.CId == dto.Id && a.IsDel == 0 && a.CTable == 79);
+                Grp_CarTouristGuideGroundReservations grp_CarTouristGuideGround= _sqlSugar.Queryable<Grp_CarTouristGuideGroundReservations>().First(a => a.Id == dto.Id && a.IsDel == 0);
+                var data = new
+                {
+                    CarTouristsConten = grp_CarTouristsConten,
+                    CarTourists = grp_CarTouristGuideGround,
+                    CreditCardPayment = _CreditCardPayment,
+                };
+                return result = new Result() { Code = 0, Msg = "查询成功", Data = data };
+
+            }
+            catch (Exception)
+            {
+                return result = new Result() { Code = -2, Msg = "未知错误" };
+                throw;
+            }
+        }
+        /// <summary>
+        /// 根据diid查询op费用列表
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
         public async Task<Result> QueryCarTouristGuideGroundByDiId(CarTouristGuideGroundDto dto)
         {
             Result result = new Result() { Code = -2, Msg = "未知错误" };
@@ -160,11 +240,12 @@ namespace OASystem.Infrastructure.Repositories.Groups
                     string sql = string.Format(@"select t.*,s.Name as CurrencyStr,c.IsAuditGM,c.PayPercentage,c.PayMoney from 
                                                 Grp_CarTouristGuideGroundReservations t
                                                 left Join Grp_CreditCardPayment c on CTable=79 and c.CId=t.Id
-                                                left Join Sys_SetData s on s.Id=t.CId {0}
+                                                left Join Sys_SetData s on s.Id=c.PaymentCurrency {0}
                                                 order by CreateTime desc", sqlWhere);
                     List<Grp_CarTouristGuideGroundView> infoViews = _sqlSugar.SqlQueryable<Grp_CarTouristGuideGroundView>(sql).ToList();
                     foreach (var item in infoViews)
                     {
+                        item.ServiceQuotedPrice = item.PayMoney;
                         item.PayThenMoney = Math.Round(item.PayPercentage/100 * item.ServiceQuotedPrice, 2);
                         item.RemainingBalance = Math.Round(item.ServiceQuotedPrice- item.PayPercentage / 100 * item.ServiceQuotedPrice);
                     }
@@ -177,7 +258,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                                             from 
                                             Grp_CarTouristGuideGroundReservations t
                                             left Join Grp_CreditCardPayment c on CTable=79 and c.CId=t.Id
-                                            left Join Sys_SetData s on s.Id=t.CId {0}
+                                            left Join Sys_SetData s on s.Id=c.PaymentCurrency {0}
                                             ) temp Where RowNumber Between {1} and {2}", sqlWhere, startIndex, endIndex);
 
                     List<Grp_CarTouristGuideGroundView> grp_CarTourists = _sqlSugar.SqlQueryable<Grp_CarTouristGuideGroundView>(sql).ToList();
@@ -217,5 +298,153 @@ namespace OASystem.Infrastructure.Repositories.Groups
             }
             return result;
         }
+
+        public async  Task<Result> OpCarTouristGuideGroundConten(OpCarTouristGuideGroundContenDto dto)
+        {
+            Result result = new Result() { Code = -2, Msg = "未知错误" };
+            try
+            {
+                BeginTran();
+                List<Grp_CarTouristGuideGroundReservationsContent> carTouristList = new List<Grp_CarTouristGuideGroundReservationsContent>();
+                foreach (var item in dto.OPContenList)
+                {
+                    Grp_CarTouristGuideGroundReservationsContent s = new Grp_CarTouristGuideGroundReservationsContent();
+                    s.Id= item.Id;
+                    s.DiId = dto.DiId;
+                    s.CTGGRId = dto.CTGGRId;
+                    s.SId = item.SId;
+                    s.Price=item.Price;
+                    s.PriceContent = item.priceContent;
+                    s.Currency = dto.Currency;
+                    s.Remark=item.Remark;
+                    s.CreateUserId = dto.CreateUserId;
+                    carTouristList.Add(s);
+                }
+                foreach (var item in carTouristList)
+                {
+                   
+                    Grp_CarTouristGuideGroundReservationsContent QueryData = _sqlSugar.Queryable<Grp_CarTouristGuideGroundReservationsContent>().First(a => a.SId == item.SId && a.Id == item.Id && a.DiId == item.DiId && a.IsDel==0);
+                    if (QueryData==null)
+                    {
+                        if (item.Price!=0)
+                        {
+                            int id = await _sqlSugar.Insertable(item).ExecuteReturnIdentityAsync();
+                            if (id == 0)
+                            {
+                                RollbackTran();
+                                return result = new Result() { Code = -2, Msg = "添加失败" };
+                            }
+                        }
+                       
+                    }
+                    else
+                    {
+                        int CTable = await _sqlSugar.Updateable<Grp_CarTouristGuideGroundReservationsContent>().Where(a => a.Id == item.Id).SetColumns(a => new Grp_CarTouristGuideGroundReservationsContent
+                        {
+                            Price = item.Price,
+                            PriceContent = item.PriceContent,
+                            Currency = dto.Currency,
+                            Remark = item.Remark,
+                        }).ExecuteCommandAsync();
+                        if (CTable==0)
+                        {
+                            RollbackTran();
+                            return result = new Result() { Code = -1, Msg = "修改失败，请稍后重试！" };
+                        }
+                    }
+                }
+                //修改C表数据
+                List<Grp_CarTouristGuideGroundReservationsContent> carTouristListEnd = _sqlSugar.Queryable<Grp_CarTouristGuideGroundReservationsContent>().Where(a=>a.DiId==dto.DiId && a.CTGGRId==dto.CTGGRId && a.IsDel==0).ToList();
+                Grp_CreditCardPayment c=new Grp_CreditCardPayment();
+                c.PaymentCurrency = dto.Currency;
+                foreach (var item in carTouristListEnd)
+                {
+                    c.PayMoney += item.Price;
+                }
+                c.PayPercentage = dto.PayPercentage;
+                c.ConsumptionDate= DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+                c.CTable = 79;
+                c.CId = dto.CTGGRId;
+                c.IsAuditGM = 0;
+                c.PayDId=dto.PayDId;
+                c.DIId = dto.DiId;
+                c.OrbitalPrivateTransfer = dto.OrbitalPrivateTransfer;
+                c.Payee=dto.Payee;
+                c.CreateUserId=dto.CreateUserId;
+                if (c.PayDId == 72)
+                {
+                    c.IsPay = 1;
+                }
+                c.RMBPrice = c.PayMoney;
+                c.DayRate = 1;
+                Grp_TeamRate _TeamRate = _sqlSugar.Queryable<Grp_TeamRate>().First(a => a.DiId == dto.DiId && a.IsDel == 0 && a.CTable == 79);
+                List<CurrencyInfo> currencyInfos = new List<CurrencyInfo>();
+                if (_TeamRate != null)
+                {
+                    Sys_SetData _SetData = _sqlSugar.Queryable<Sys_SetData>().First(a => a.IsDel == 0 && a.Id == c.PaymentCurrency);
+                    if (_SetData != null)
+                    {
+                        currencyInfos = CommonFun.GetCurrencyChinaToList(_TeamRate.Remark);
+                        CurrencyInfo CurrencyRate = currencyInfos.FirstOrDefault(a => a.CurrencyCode == _SetData.Name);
+                        if (CurrencyRate != null)
+                        {
+                            c.RMBPrice = c.PayMoney * Convert.ToDecimal(CurrencyRate.Rate);
+                            c.DayRate = CurrencyRate.Rate;
+                        }
+                    }
+                }
+                Grp_CreditCardPayment grp_CreditCard = _sqlSugar.Queryable<Grp_CreditCardPayment>().First(a=>a.CId==dto.CTGGRId && a.IsDel==0 && a.CTable==79 && a.DIId==dto.DiId);
+                if (grp_CreditCard!=null)//修改
+                {
+                    int CTable = await _sqlSugar.Updateable<Grp_CreditCardPayment>().Where(a => a.CId == dto.CTGGRId && a.CTable == 79 && a.DIId==dto.DiId).SetColumns(a => new Grp_CreditCardPayment
+                    {
+                        PaymentCurrency = c.PaymentCurrency,
+                        PayMoney = c.PayMoney,
+                        PayPercentage = c.PayPercentage,
+                        CTable = c.CTable,
+                        PayDId = c.PayDId,
+                        OrbitalPrivateTransfer = c.OrbitalPrivateTransfer,
+                        Payee = c.Payee,
+                        IsPay = c.IsPay,
+                        RMBPrice = c.RMBPrice,
+                        DayRate = c.DayRate,
+                    }).ExecuteCommandAsync();
+                    if (CTable == 0)
+                    {
+                        RollbackTran();
+                        return result = new Result() { Code = -2, Msg = "修改失败" };
+                    }
+                }
+                else//添加
+                {
+                    int id = await _sqlSugar.Insertable(c).ExecuteReturnIdentityAsync();
+                    if (id == 0)
+                    {
+                        RollbackTran();
+                        return result = new Result() { Code = -2, Msg = "添加失败" };
+                    }
+                }
+                int CarTouristGuideCTable = await _sqlSugar.Updateable<Grp_CarTouristGuideGroundReservations>().Where(a => a.Id == dto.CTGGRId && a.DiId == dto.DiId).SetColumns(a => new Grp_CarTouristGuideGroundReservations
+                {
+                    
+                CId=dto.Currency,
+                ServiceQuotedPrice=c.PayMoney,
+                OrbitalPrivateTransfer = dto.OrbitalPrivateTransfer,
+                }).ExecuteCommandAsync();
+                if (CarTouristGuideCTable == 0)
+                {
+                    RollbackTran();
+                    return result = new Result() { Code = -2, Msg = "修改失败" };
+                }
+                result = new Result() { Code =0, Msg = "保存成功" };
+                CommitTran();
+            }
+            catch (Exception)
+            {
+                return result = new Result() { Code = -2, Msg = "未知错误" };
+                throw;
+            }
+            return result;
+        }
     }
 }

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

@@ -77,12 +77,15 @@ namespace OASystem.Infrastructure.Repositories.Groups
 
                 List<Grp_GroupsTaskAssignment> grp_GroupsTaskAssignment = Query<Grp_GroupsTaskAssignment>(a => a.IsDel == 0 && a.UId == dto.UserId && a.CTId == dto.CTId).ToList();
 
-                string DiId = "";
+                string DiId = "0";
                 foreach (var item in grp_GroupsTaskAssignment)
                 {
                     DiId += item.DIId + ",";
                 }
-                DiId = DiId.Substring(0, DiId.Length - 1);
+                if (DiId!="0")
+                {
+                    DiId = DiId.Substring(0, DiId.Length - 1);
+                }
                 string sql = string.Format(@"select * from Grp_DelegationInfo where Id in({0}) and IsDel={1}", DiId, 0);
                 List<Grp_DelegationInfo> grp_Delegations = _sqlSugar.SqlQueryable<Grp_DelegationInfo>(sql).ToList();
                 if (grp_Delegations.Count == 0)

OASystem/OASystem.Infrastructure/Repositories/Groups/VisaPriceRepository.cs

@@ -176,7 +176,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                 {
                     c.IsPay = 1;
                 }
-                c.RMBPrice = c.RMBPrice;
+                c.RMBPrice = c.PayMoney;
                 c.DayRate = 1;
                 Grp_TeamRate _TeamRate = _sqlSugar.Queryable<Grp_TeamRate>().First(a => a.DiId == dto.DiId && a.IsDel == 0 && a.CTable == 80);
                 List<CurrencyInfo> currencyInfos = new List<CurrencyInfo>();
@@ -186,7 +186,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                     if (_SetData!=null)
                     {
                         currencyInfos = CommonFun.GetCurrencyChinaToList(_TeamRate.Remark);
-                        CurrencyInfo CurrencyRate = currencyInfos.Where(a => a.CurrencyCode == _SetData.Name).First();
+                        CurrencyInfo CurrencyRate = currencyInfos.FirstOrDefault(a => a.CurrencyCode == _SetData.Name);
                         if (CurrencyRate!=null)
                         {
                             c.RMBPrice = c.PayMoney * Convert.ToDecimal(CurrencyRate.Rate);