op部分调整

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -2117,7 +2117,7 @@ FROM
             catch (Exception)
             { }
 
-            var guojiaoDownFile = new List<int>() { 330,383};
+            var guojiaoDownFile = new List<int>() { 330, 383 };
             var shichangDownFile = new List<int>() { 95 };
             if (allDownFile.Contains(dto.UserId))
             {
@@ -4342,7 +4342,7 @@ FROM
         /// <returns></returns>
         [HttpGet("{id}")]
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
-        public async Task<IActionResult> FeeAuditOtherFileDownlaod([Range(1,int.MaxValue,ErrorMessage ="请传入有效的ID")]int id)
+        public async Task<IActionResult> FeeAuditOtherFileDownlaod([Range(1, int.MaxValue, ErrorMessage = "请传入有效的ID")] int id)
         {
             //网站域名
             const string baseUrl = "http://132.232.92.186:24/Office/GrpFile/%E5%9B%A2%E7%BB%84%E5%A2%9E%E5%87%8F%E6%AC%BE%E9%A1%B9%E7%9B%B8%E5%85%B3%E6%96%87%E4%BB%B6/";
@@ -4350,7 +4350,7 @@ FROM
             var otherInfo = await _decreasePaymentsRep._sqlSugar
                 .Queryable<Grp_DecreasePayments>()
                 .InnerJoin<Grp_CreditCardPayment>((x, y) => x.Id == y.CId && y.Id == id)
-                .Where(((x, y) =>  x.IsDel == 0 && y.IsDel == 0))
+                .Where(((x, y) => x.IsDel == 0 && y.IsDel == 0))
                 .Select((x, y) => new
                 {
                     x.Id,
@@ -7476,11 +7476,11 @@ FROM
 
                 var checkCurrencys = await _enterExitCostRep.GetCheckCurrencies(dto.DiId);
                 //汇率验证、反推 
-                (bool isSendMsg,string msgContent,List<CurrencyInfo> liveRates) = await GeneralMethod.EnterExitCostCheckRate(dto.DiId, checkCurrencys);
+                (bool isSendMsg, string msgContent, List<CurrencyInfo> liveRates) = await GeneralMethod.EnterExitCostCheckRate(dto.DiId, checkCurrencys);
                 if (isSendMsg)
                 {
                     //消息推送
-                    await AppNoticeLibrary.SendUserMsg_GroupShare_ToFin(dto.DiId,dto.UserId,msgContent);
+                    await AppNoticeLibrary.SendUserMsg_GroupShare_ToFin(dto.DiId, dto.UserId, msgContent);
 
                 }
 
@@ -15217,18 +15217,26 @@ FROM
                 .First(x => x.IsDel == 0 && x.DiId == dto.DiId && x.Id == dto.CTGGRId);
                 if (opinfos.PriceType == 1062)
                 {
-                    var isAuto = false; 
+                    var isAuto = false;
                     //找对应的首付款
                     var firstPrice = _sqlSugar.Queryable<Grp_CarTouristGuideGroundReservations>()
-                            .InnerJoin<Grp_CreditCardPayment>((x,a) => a.IsDel == 0  && a.CTable == 79 && a.CId == x.Id && a.DIId == x.DiId && (a.IsAuditGM == 1 || a.IsAuditGM == 3 ))
+                            .InnerJoin<Grp_CreditCardPayment>((x, a) => a.IsDel == 0 && a.CTable == 79 && a.CId == x.Id && a.DIId == x.DiId && (a.IsAuditGM == 1 || a.IsAuditGM == 3))
                             .First(x => x.IsDel == 0 && x.DiId == dto.DiId && x.PriceName == opinfos.PriceName &&
                              x.ServiceStartTime == opinfos.ServiceStartTime && x.ServiceEndTime == opinfos.ServiceEndTime && x.Area == opinfos.Area &&
                              x.PriceType == 1061 && x.DiId == dto.DiId);
 
-                    if (firstPrice!= null && !(opinfos.SelectCheck.Contains("超时") || opinfos.SelectCheck.Contains("超支")) && firstPrice.CId == opinfos.CId)
+                    if (firstPrice != null && !(opinfos.SelectCheck.Contains("超时") || opinfos.SelectCheck.Contains("超支")) && firstPrice.CId == opinfos.CId)
                     {
                         var cprice = _sqlSugar.Queryable<Grp_CreditCardPayment>().First(x => x.IsDel == 0 && x.CId == firstPrice.Id && x.CTable == 79);
                         var balance = firstPrice.ServiceQuotedPrice * (100 - cprice.PayPercentage) / 100;
+
+                        //合计中排除城市税
+                        var cityPrice = _sqlSugar.Queryable<Grp_CarTouristGuideGroundReservationsContent>()
+                                                    .Where(x => x.SId == 1452 && x.IsDel == 0 && x.DiId == dto.DiId && x.CTGGRId == dto.CTGGRId)
+                                                    .Sum(x => x.Price * x.Count);
+
+                        opinfos.ServiceQuotedPrice = opinfos.ServiceQuotedPrice - cityPrice;
+
                         if (balance >= opinfos.ServiceQuotedPrice)
                         {
                             isAuto = true;
@@ -18203,9 +18211,9 @@ FROM
 
             foreach (var item in dataSourceKeys)
             {
-                Func<TitleModel, bool> expr = x => x.label.Replace(" ", "").Replace("/", "") == item 
+                Func<TitleModel, bool> expr = x => x.label.Replace(" ", "").Replace("/", "") == item
                 || x.label.Replace(" ", "").Replace("/", "").ToUpper() == item.ToUpper();
-                
+
                 var find = dto.titleModel.FirstOrDefault(expr);
                 if (find != null)
                 {
@@ -19920,7 +19928,7 @@ AirHotelPrice
             #region 机票系数
 
             #region 经济舱系数
-            var jjcXS = 0.00M; 
+            var jjcXS = 0.00M;
             switch (dto.JJCCB)
             {
                 case decimal x when (x >= 1000 && x <= 3000):
@@ -20041,7 +20049,7 @@ AirHotelPrice
 
             switch (dto.DJRS)
             {
-                case 2 or 3 :
+                case 2 or 3:
                     djXS = 2.65M;
                     break;
                 case 4:
@@ -26563,7 +26571,7 @@ ORDER BY
             var ConferenceAffairsCost = _sqlSugar.Queryable<Grp_ConferenceAffairsCost>()
                                                  .Where(x => x.IsDel == 0)
                                                  .Select<ConferenceAffairsCostView>()
-                                                 .First(x=> x.Diid == di.Id);
+                                                 .First(x => x.Diid == di.Id);
 
             if (ConferenceAffairsCost == null)
             {
@@ -26574,11 +26582,11 @@ ORDER BY
             #region 权限校验
             var ids = _sqlSugar.Queryable<Grp_ConferenceAffairsCostControl>()
                 .Where(x => x.Diid == di.Id && x.IsDel == 0)
-                .Select(x=> x.UserId)
+                .Select(x => x.UserId)
                 .Distinct()
                 .ToList();
 
-            if (!ids.Contains(Dto.UserId) && !isGM )
+            if (!ids.Contains(Dto.UserId) && !isGM)
             {
                 return Ok(JsonView(201, "暂无权限!", new
                 {
@@ -26599,7 +26607,7 @@ ORDER BY
             var ConferenceAffairsCostChi = _sqlSugar.Queryable<Grp_ConferenceAffairsCostChild>()
                 .Where(x => x.IsDel == 0 && x.Diid == di.Id)
                 .Select<ConferenceAffairsCostChildView>()
-                .OrderBy(x=>x.Index)
+                .OrderBy(x => x.Index)
                 .ToList();
 
             for (int i = 1; i <= ConferenceAffairsCostChi.Count; i++)
@@ -26658,7 +26666,7 @@ ORDER BY
                     data.Diid = Dto.GroupId;
                     data.CreateTime = DateTime.Now;
                     data.CreateUserId = Dto.UserId;
-                    data.Id =  _sqlSugar.Insertable<Grp_ConferenceAffairsCost>(data)
+                    data.Id = _sqlSugar.Insertable<Grp_ConferenceAffairsCost>(data)
                                         .ExecuteReturnIdentity();
                 }
                 else
@@ -26668,7 +26676,7 @@ ORDER BY
                     data.Id = data.Id;
                 }
 
-                
+
 
                 if (Dto.ConferenceAffairsCostChild.Any())
                 {
@@ -26681,13 +26689,13 @@ ORDER BY
 
                     var inrsetCount = insertArr.Any() ? _sqlSugar.Insertable<Grp_ConferenceAffairsCostChild>(insertArr).ExecuteCommand() : 0;
                     var updateCount = updateArr.Any() ? _sqlSugar.Updateable<Grp_ConferenceAffairsCostChild>(updateArr)
-                        .IgnoreColumns(x=> new { x.ConferenceAffairsCostId })
+                        .IgnoreColumns(x => new { x.ConferenceAffairsCostId })
                         .ExecuteCommand() : 0;
 
                     childResult = childResult with
                     {
-                         error = notUpdateArr.Count(),
-                         success = inrsetCount + updateCount
+                        error = notUpdateArr.Count(),
+                        success = inrsetCount + updateCount
                     };
                 }
 
@@ -26699,7 +26707,7 @@ ORDER BY
                 return Ok(JsonView(false, "失败！" + ex.Message));
             }
 
-            return Ok(JsonView(true,"操作成功！", childResult));
+            return Ok(JsonView(true, "操作成功！", childResult));
         }
 
         [HttpPost]
@@ -26718,7 +26726,7 @@ ORDER BY
                     ExecuteCommand();
             }
 
-            return Ok(JsonView(true, "操作成功！",count));
+            return Ok(JsonView(true, "操作成功！", count));
         }
 
         /// <summary>
@@ -26928,10 +26936,10 @@ ORDER BY
             ").ToList();
 
             var currLists = chiExcelContent.Select(x => new CurrList
-                                            {
-                                                CurrName = x.CurrencyStr,
-                                                CurrRate = x.Rate
-                                            })
+            {
+                CurrName = x.CurrencyStr,
+                CurrRate = x.Rate
+            })
                                             .Distinct()
                                             .ToList();
 
@@ -26940,7 +26948,7 @@ ORDER BY
                 Workbook = new Workbook(loadPath)
             };
 
-            var MostCurr = _sqlSugar.Queryable<Sys_SetData>().First(x=>x.IsDel == 0 && x.Id == main.MostCurr);
+            var MostCurr = _sqlSugar.Queryable<Sys_SetData>().First(x => x.IsDel == 0 && x.Id == main.MostCurr);
             MostCurr ??= new Sys_SetData { Name = "暂无！" };
 
             designer.SetDataSource("TeamName", di.TeamName);
@@ -26972,8 +26980,8 @@ ORDER BY
         [HttpPost]
         public async Task<IActionResult> QueryConferenceAffairsChild(QueryConferenceAffairsChildDto Dto)
         {
-            return Ok(JsonView(true,"SUCCESS", _sqlSugar.Queryable<Grp_ConferenceAffairsCostChild>().Where(x => x.IsDel == 0 && x.Diid == Dto.GroupId)
-                .Select(x=>x.PriceName).ToList()));
+            return Ok(JsonView(true, "SUCCESS", _sqlSugar.Queryable<Grp_ConferenceAffairsCostChild>().Where(x => x.IsDel == 0 && x.Diid == Dto.GroupId)
+                .Select(x => x.PriceName).ToList()));
         }
 
 

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

@@ -116,7 +116,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                     }
                 }
                 #region add导游地接数据屏蔽
-                
+
                 //if (id != 0)
                 //{
                 //    var _LocalGuideDataCar = _sqlSugar.Queryable<Res_LocalGuideData>()
@@ -153,7 +153,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                 //        int cId = await _sqlSugar.Insertable(res_LocalGuideService).ExecuteReturnIdentityAsync();
                 //    }
                 //}
-                
+
                 #endregion
                 CommitTran();
             }
@@ -1175,7 +1175,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                 Regex regex = new Regex("^[\u4e00-\u9fa5]{0,}$");
 
                 //城市税排除计算
-                var excludeList = new List<int>() { 1452  };
+                var excludeList = new List<int>(); // { 1452  }
 
                 #region 修改C表数据