收款退还与其他款项

更改 CTable = 98

OASystem/OASystem.Api/Controllers/BusinessController.cs

@@ -7,6 +7,7 @@ using OASystem.Domain.Dtos.Business;
 using OASystem.Domain.Dtos.Financial;
 using OASystem.Domain.Dtos.Groups;
 using OASystem.Domain.Entities.Business;
+using OASystem.Domain.Entities.Financial;
 using OASystem.Domain.Entities.Groups;
 using OASystem.Domain.Entities.Resource;
 using OASystem.Domain.ViewModels.Business;
@@ -83,7 +84,6 @@ namespace OASystem.API.Controllers
         /// <summary>
         /// 币种 List
         /// </summary>
-        /// <param name="dto"></param>
         /// <returns></returns>
         [HttpGet,HttpPost]
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
@@ -211,7 +211,7 @@ namespace OASystem.API.Controllers
                         {
                             teamRateDescViews = teamRateDescViews.OrderBy(it => it.CurrencyId).ToList();
                         }
-                        
+
                         teamRateModelInfo.TeamRates = teamRateDescViews;
                         teamRateModels = teamRateModelInfo;
                     }

OASystem/OASystem.Api/Controllers/FinancialController.cs

@@ -902,6 +902,7 @@ namespace OASystem.API.Controllers
 
 
                 PageFunAuthViewBase pageFunAuth = new PageFunAuthViewBase();
+
                 #region 页面功能权限处理
 
                 pageFunAuth = await GeneralMethod.PostUserPageFuncDatas(dto.UserId, dto.PageId);

OASystem/OASystem.Domain/Dtos/Financial/TeamRateDto.cs

@@ -82,6 +82,9 @@ namespace OASystem.Domain.Dtos.Financial
         /// <summary>
         /// 业务类型Id
         /// 酒店预定，机票预定，等等
+        /// 76	酒店预订 77	行程           79  车/导游地接
+        /// 80	签证     81	邀请/公务活动  82  团组客户保险
+        /// 85	机票预订 98	其他款项       751 酒店早餐
         /// </summary>
         public int CTbale { get; set; }
     }

OASystem/OASystem.Infrastructure/Repositories/Financial/PaymentRefundAndOtherMoneyRepository.cs

@@ -56,7 +56,7 @@ namespace OASystem.Infrastructure.Repositories.Financial
 				                         From Fin_PaymentRefundAndOtherMoney prom
 				                         Left Join Sys_Users u On u.Id = prom.CreateUserId 
 				                         Left Join Sys_SetData sd On prom.CurrencyId = sd.Id
-					                     Left Join Grp_CreditCardPayment ccp On ccp.CTable = 285 And ccp.CId = prom.Id
+					                     Left Join Grp_CreditCardPayment ccp On ccp.CTable = 98 And ccp.CId = prom.Id
 				                         Where prom.IsDel = 0 And u.IsDel = 0 And sd.IsDel = 0 And  ccp.IsDel = 0
 					                     And prom.DiId = {0}", diId);
 
@@ -194,7 +194,7 @@ namespace OASystem.Infrastructure.Repositories.Financial
                 string sql = string.Format(@"Select prom.Id,ccp.Id CcpId,prom.DiId,prom.PriceName,prom.Price,prom.CurrencyId,ccp.Payee,ccp.PayDId,
 										 ccp.OrbitalPrivateTransfer,ccp.ConsumptionPatterns,prom.PayType,prom.Remark
 										 From Fin_PaymentRefundAndOtherMoney prom 
-										 Left Join Grp_CreditCardPayment ccp On ccp.CId = prom.id And ccp.CTable = 79 And ccp.IsDel = 0
+										 Left Join Grp_CreditCardPayment ccp On ccp.CId = prom.id And ccp.CTable = 98 And ccp.IsDel = 0
 										 Where prom.IsDel = 0 And prom.Id = {0}", dto.Id);
                 var data = await _sqlSugar.SqlQueryable<Fin_PaymentRefundAndOtherMoneyInfoView>(sql).ToListAsync();
 
@@ -286,7 +286,7 @@ namespace OASystem.Infrastructure.Repositories.Financial
                     //Id = dto.CcpId,
                     //CId = dto.CcpId,
                     DIId = dto.DiId,
-                    CTable = 285,
+                    CTable = 98,
                     PayDId = dto.PayDId,
                     ConsumptionPatterns = dto.ConsumptionPatterns,
                     ConsumptionDate = string.Empty,
@@ -357,13 +357,12 @@ namespace OASystem.Infrastructure.Repositories.Financial
                 }
                 else if (dto.Status == 2) //修改
                 {
-                    _PaymentRefundAndOtherMoney.Id = dto.Id;
                     _CreditCardPayment.Id = dto.CcpId;
                     _CreditCardPayment.CId = dto.Id;
 
                     _sqlSugar.BeginTran();
 
-                    var prom_update = await _sqlSugar.Updateable(_PaymentRefundAndOtherMoney)
+                    var prom_update = await _sqlSugar.Updateable(_CreditCardPayment)
                                                      .IgnoreColumns(it => new { it.CreateUserId, it.CreateTime, it.DeleteUserId, it.DeleteTime, it.IsDel })
                                                      .WhereColumns(it => new { it.Id })
                                                      .ExecuteCommandAsync();