酒店预订 生成 预定成本 Excel 增加币种

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -70,6 +70,7 @@ using System.Linq;
 using NPOI.POIFS.NIO;
 using OASystem.API.OAMethodLib.QiYeWeChatAPI.AppNotice;
 using OASystem.Domain.ViewModels.Statistics;
+using NPOI.XSSF.Model;
 
 namespace OASystem.API.Controllers
 {
@@ -10364,35 +10365,41 @@ namespace OASystem.API.Controllers
 
             #region 数据处理
 
+            var currDatas = _sqlSugar.Queryable<Sys_SetData>().Where(it => it.STid == 66).ToList();
             foreach (var item in hrDtas)
             {
                 var ccpInfo = _sqlSugar.Queryable<Grp_CreditCardPayment>().Where(it => it.DIId == _dto.DiId && it.CId == item.Id).First();
-
+                string roomCurr = currDatas.Find(it => it.Id == ccpInfo.PaymentCurrency)?.Name ?? "";
                 pcfds.Add(new HotelReservations_PCFD_View()
                 {
                     City = item.City,
                     HotelName = item.HotelName,
                     Date = $"{item.CheckInDate} - {item.CheckOutDate}",
                     SingleRoomCount = item.SingleRoomCount,
-                    SingleRoomPrice = item.SingleRoomPrice,
+                    SingleRoomPrice = item.SingleRoomPrice.ToString("#0.00") + " " + roomCurr,
                     DoubleRoomCount = item.DoubleRoomCount,
-                    DoubleRoomPrice = item.DoubleRoomPrice,
+                    DoubleRoomPrice = item.DoubleRoomPrice.ToString("#0.00") + " " + roomCurr,
                     SuiteRoomCount = item.SuiteRoomCount,
-                    SuiteRoomPrice = item.SuiteRoomPrice,
-                    OtherRoomPrice = item.OtherRoomPrice,
+                    SuiteRoomPrice = item.SuiteRoomPrice.ToString("#0.00") + " " + roomCurr,
+                    OtherRoomPrice = item.OtherRoomPrice.ToString("#0.00") + " " + roomCurr,
                     OtherRoomCount = item.OtherRoomCount,
                     RoomCurrency = _sqlSugar.Queryable<Sys_SetData>().Where(it => it.Id == ccpInfo.PaymentCurrency).First()?.Name ?? "",
 
+                    BreakfastPrice = $"{item.BreakfastPrice.ToString("#0.00")} {currDatas.Find(it => it.Id == item.BreakfastCurrency)?.Name ??  ""}",
+                    GovernmentRent = $"{item.GovernmentRent.ToString("#0.00")} {currDatas.Find(it => it.Id == item.GovernmentRentCurrency)?.Name ?? ""}",
+                    CityTax = $"{item.CityTax.ToString("#0.00")} {currDatas.Find(it => it.Id == item.CityTaxCurrency)?.Name ?? ""}",
+
                     RoomExplanation = item.RoomExplanation,
                     PayTypeName = _sqlSugar.Queryable<Sys_SetData>().Where(it => it.Id == ccpInfo.PayDId).First()?.Name ?? "",
                     PayTime = ccpInfo.ConsumptionDate,
                     BankNo = ccpInfo.BankNo,
-                    PayMoney = ccpInfo.PayMoney,
+                    PayMoney = ccpInfo.PayMoney.ToString("#0.00") + " " + _sqlSugar.Queryable<Sys_SetData>().Where(it => it.Id == ccpInfo.PaymentCurrency).First()?.Name ?? "",
+                    PayMoneys = ccpInfo.PayMoney.ToString("#0.00"),
                     PayMoneyCurrency = _sqlSugar.Queryable<Sys_SetData>().Where(it => it.Id == ccpInfo.PaymentCurrency).First()?.Name ?? "",
-                    CardPrice = item.CardPrice,
+                    CardPrice = item.CardPrice + " " + _sqlSugar.Queryable<Sys_SetData>().Where(it => it.Id == ccpInfo.PaymentCurrency).First()?.Name ?? "",
                     Remark = ccpInfo.Remark
 
-                }) ;
+                }); 
             }
 
             #endregion

OASystem/OASystem.Domain/ViewModels/Groups/HotelReservationsByDiIdView.cs

@@ -401,7 +401,7 @@ namespace OASystem.Domain.ViewModels.Groups
         /// <summary>
         /// 单间单价
         /// </summary>
-        public decimal SingleRoomPrice { get; set; }
+        public string SingleRoomPrice { get; set; }
         /// <summary>
         /// 双间数量
         /// </summary>
@@ -409,7 +409,7 @@ namespace OASystem.Domain.ViewModels.Groups
         /// <summary>
         /// 双间单价
         /// </summary>
-        public decimal DoubleRoomPrice { get; set; }
+        public string DoubleRoomPrice { get; set; }
         /// <summary>
         /// 套房数量
         /// </summary>
@@ -417,7 +417,7 @@ namespace OASystem.Domain.ViewModels.Groups
         /// <summary>
         /// 套房单价
         /// </summary>
-        public decimal SuiteRoomPrice { get; set; }
+        public string SuiteRoomPrice { get; set; }
         /// <summary>
         /// 其他房型数量
         /// </summary>
@@ -425,10 +425,26 @@ namespace OASystem.Domain.ViewModels.Groups
         /// <summary>
         /// 其他房型单价
         /// </summary>
-        public decimal OtherRoomPrice { get; set; }
+        public string OtherRoomPrice { get; set; }
 
         public string RoomCurrency { get; set; }
 
+        /// <summary>
+        /// 早餐费
+        /// </summary>
+        public string BreakfastPrice { get; set; }
+
+        /// <summary>
+        /// 地税
+        /// </summary>
+        public string GovernmentRent { get; set; }
+        /// <summary>
+        /// 城市税
+        /// </summary>
+        public string CityTax { get; set; }
+
+
+        public string PayMoneys { get; set; }
         /// <summary>
         /// 消费说明
         /// </summary>
@@ -454,7 +470,7 @@ namespace OASystem.Domain.ViewModels.Groups
         /// <summary>
         /// 付款金额
         /// </summary>
-        public decimal PayMoney { get; set; }
+        public string PayMoney { get; set; }
 
         /// <summary>
         /// 付款付款金额币种
@@ -464,7 +480,7 @@ namespace OASystem.Domain.ViewModels.Groups
         /// <summary>
         /// 行用卡金额
         /// </summary>
-        public decimal CardPrice { get; set; }
+        public string CardPrice { get; set; }
 
         /// <summary>
         /// 备注