Browse Source

酒店预订
酒店详情字段 修改

leiy 1 year ago
parent
commit
8e72f27095

+ 11 - 2
OASystem/OASystem.Domain/ViewModels/Groups/HotelReservationsByDiIdView.cs

@@ -116,9 +116,9 @@ namespace OASystem.Domain.ViewModels.Groups
         public int GTId { get; set; }
 
         /// <summary>
-        /// 信用卡类型 (设置数据外键编号)
+        /// 卡类型 (设置数据外键编号)
         /// </summary>
-        public int CardPriceCurrency { get; set; }
+        public int CTDId { get; set; }
 
         /// <summary>
         /// 入住卷号
@@ -296,6 +296,15 @@ namespace OASystem.Domain.ViewModels.Groups
         /// </summary>
         public int PaymentCurrency { get; set; }
 
+        /// <summary>
+        /// 银行卡号
+        /// </summary>
+        public string BankNo { get; set; }
+        /// <summary>
+        /// 持卡人姓名
+        /// </summary>
+        public string CardholderName { get; set; }
+
         /// <summary>
         /// 对方开户行
         /// </summary>

+ 12 - 11
OASystem/OASystem.Infrastructure/Repositories/Groups/HotelPriceRepository.cs

@@ -859,17 +859,18 @@ namespace OASystem.Infrastructure.Repositories.Groups
                 return _result;
             }
 
-            string sql = string.Format(@"Select hr.Id,hr.DiId,hr.GTId,hr.CardPriceCurrency,hr.CheckNumber,hr.ReservationsWebsite,hr.ReservationsNo,hr.DetermineNo,
-										 hr.City,hr.HotelName,hr.HotelTel,hr.HotelAddress,hr.GuestName,hr.CheckInDate,hr.CheckOutDate,hr.CheckType,
-										 hr.RoomExplanation,hr.Remark As HotelRemark,hr.SingleRoomPrice,hr.SingleRoomCount,hr.DoubleRoomPrice,
-										 hr.DoubleRoomCount,hr.SuiteRoomPrice,hr.SuiteRoomCount,hr.OtherRoomPrice,hr.OtherRoomCount,hr.CardPrice,
-										 hr.Isoppay,hr.BreakfastPrice,hr.BreakfastCurrency,hr.GovernmentRent,hr.GovernmentRentCurrency,hr.CityTax,
-										 hr.CityTaxCurrency,ccp.PayDId,ccp.ConsumptionPatterns,ccp.ConsumptionDate,ccp.PayMoney,ccp.PaymentCurrency,
-										 ccp.OtherBankName,ccp.OtherSideNo,ccp.OtherSideName,ccp.Payee,ccp.OrbitalPrivateTransfer,ccp.Remark As CcpRemark
-										 From Grp_HotelReservations  hr
-										 Inner Join Grp_CreditCardPayment ccp On hr.DiId = ccp.DIId And hr.Id = ccp.CId 
-										 And ccp.CTable = 76
-										 Where hr.IsDel = 0 And ccp.IsDel = 0 And  hr.Id = {0}", id);
+            string sql = string.Format(@"Select hr.Id,hr.DiId,hr.GTId,hr.CardPriceCurrency,hr.CheckNumber,hr.ReservationsWebsite,hr.ReservationsNo,
+                                         hr.DetermineNo,hr.City,hr.HotelName,hr.HotelTel,hr.HotelAddress,hr.GuestName,hr.CheckInDate,hr.CheckOutDate,
+                                         hr.CheckType,hr.RoomExplanation,hr.Remark As HotelRemark,hr.SingleRoomPrice,hr.SingleRoomCount,hr.DoubleRoomPrice,
+                                         hr.DoubleRoomCount,hr.SuiteRoomPrice,hr.SuiteRoomCount,hr.OtherRoomPrice,hr.OtherRoomCount,hr.CardPrice,
+                                         hr.Isoppay,hr.BreakfastPrice,hr.BreakfastCurrency,hr.GovernmentRent,hr.GovernmentRentCurrency,hr.CityTax,
+                                         hr.CityTaxCurrency,ccp.PayDId,ccp.ConsumptionPatterns,ccp.ConsumptionDate,ccp.PayMoney,ccp.PaymentCurrency,
+                                         ccp.BankNo,ccp.CardholderName,ccp.OtherBankName,ccp.OtherSideNo,ccp.OtherSideName,ccp.Payee,
+                                         ccp.OrbitalPrivateTransfer,ccp.Remark As CcpRemark
+                                         From Grp_HotelReservations hr
+                                         Inner Join Grp_CreditCardPayment ccp On hr.DiId = ccp.DIId And hr.Id = ccp.CId 
+                                         And ccp.CTable = 76
+                                         Where hr.IsDel = 0 And ccp.IsDel = 0 And  hr.Id = {0}", id);
 
             if (portType == 1 || portType == 2 || portType == 3)
             {