酒店预定

详情

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -38,6 +38,8 @@ using NPOI.POIFS.FileSystem;
 using Microsoft.AspNetCore.Mvc.ViewEngines;
 using OASystem.Domain.ViewModels.QiYeWeChat;
 using OASystem.Domain.Entities.Financial;
+using NPOI.POIFS.Crypt.Dsig;
+using System.Diagnostics.Eventing.Reader;
 
 namespace OASystem.API.Controllers
 {
@@ -4436,10 +4438,10 @@ namespace OASystem.API.Controllers
         }
         #endregion
 
-        #region 酒店预定 新 雷怡 2023-12-28 17:45
+        #region 酒店预订 新 雷怡 2023-12-28 17:45
 
         /// <summary>
-        /// 酒店预定 _BasicsDataInit
+        /// 酒店预订 
         /// 酒店费用列表 根据团组Id查询
         /// </summary>
         /// <param name="_dto"></param>
@@ -4455,6 +4457,11 @@ namespace OASystem.API.Controllers
                 if (_dto.PageId < 1) _dto.PageId = 28; //酒店预定Id
                 if (_dto.DiId < 1) return Ok(JsonView(false, "团组Id为空"));
 
+                #region 团组操作权限验证 76 酒店预定模块
+                var groupAuthView = await GeneralMethod.PostGroupOperationAuth(_dto.DiId, _dto.UserId, 76);
+                if (groupAuthView.Code != 0) return Ok(JsonView(false, groupAuthView.Msg));
+                #endregion
+
                 PageFunAuthViewBase pageFunAuthView = new PageFunAuthViewBase();
 
                 #region 页面操作权限验证
@@ -4465,13 +4472,18 @@ namespace OASystem.API.Controllers
 
                 #endregion
 
-
-                Result groupData = await _hotelPriceRep._ItemsByDiId(_dto.PortType,_dto.DiId);
-                if (groupData.Code != 0)
+                Result data = await _hotelPriceRep._ItemsByDiId(_dto.PortType, _dto.DiId);
+                if (data.Code != 0)
                 {
-                    return Ok(JsonView(false, groupData.Msg));
+                    return Ok(JsonView(false, data.Msg));
                 }
-                return Ok(JsonView(true, groupData.Msg, groupData.Data));
+                var _view = new
+                {
+                    PageFuncAuth = pageFunAuthView,
+                    Data = data
+                };
+
+                return Ok(JsonView(true, data.Msg, _view));
             }
             catch (Exception ex)
             {
@@ -4480,8 +4492,8 @@ namespace OASystem.API.Controllers
         }
 
         /// <summary>
-        /// 酒店预定 _BasicsDataInit
-        /// 酒店费用列表 根据团组Id查询
+        /// 酒店预订
+        /// 基础数据
         /// </summary>
         /// <param name="_dto"></param>
         /// <returns></returns>
@@ -4491,7 +4503,74 @@ namespace OASystem.API.Controllers
         {
             try
             {
-                Result data = await _hotelPriceRep._BasicsDataInit(_dto);
+                #region  参数验证
+                if (_dto.UserId < 1) return Ok(JsonView(false, "员工Id为空"));
+                if (_dto.PageId < 1) _dto.PageId = 28; //酒店预定Id
+                if (_dto.DiId < 1) return Ok(JsonView(false, "团组Id为空"));
+
+                PageFunAuthViewBase pageFunAuthView = new PageFunAuthViewBase();
+
+                #region 页面操作权限验证
+                pageFunAuthView = await GeneralMethod.PostUserPageFuncDatas(_dto.UserId, _dto.PageId);
+
+                if (pageFunAuthView.CheckAuth == 0) return Ok(JsonView(false, "您没有查看权限!"));
+                #endregion
+
+                #region 团组操作权限验证 76 酒店预定模块
+                var groupAuthView = await GeneralMethod.PostGroupOperationAuth(_dto.DiId, _dto.UserId, 76);
+                if (groupAuthView.Code != 0) return Ok(JsonView(false, groupAuthView.Msg));
+                #endregion
+
+                #endregion
+
+                Result data = await _hotelPriceRep._BasicsDataInit(_dto.PortType, _dto.DiId);
+                if (data.Code != 0)
+                {
+                    return Ok(JsonView(false, data.Msg));
+                }
+                return Ok(JsonView(true, data.Msg, data.Data));
+
+
+            }
+            catch (Exception ex)
+            {
+                return Ok(JsonView(false, ex.Message));
+            }
+        }
+
+        /// <summary>
+        /// 酒店预订
+        /// 详情
+        /// </summary>
+        /// <param name="_dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        public async Task<IActionResult> PostHotelReservationsDetails(HotelReservationsDetails _dto)
+        {
+            try
+            {
+                #region  参数验证
+                if (_dto.UserId < 1) return Ok(JsonView(false, "员工Id为空"));
+                if (_dto.PageId < 1) _dto.PageId = 28; //酒店预定Id
+                if (_dto.DiId < 1) return Ok(JsonView(false, "团组Id为空"));
+
+                #region 团组操作权限验证 76 酒店预定模块
+                var groupAuthView = await GeneralMethod.PostGroupOperationAuth(_dto.DiId, _dto.UserId, 76);
+                if (groupAuthView.Code != 0) return Ok(JsonView(false, groupAuthView.Msg));
+                #endregion
+
+                PageFunAuthViewBase pageFunAuthView = new PageFunAuthViewBase();
+
+                #region 页面操作权限验证
+                pageFunAuthView = await GeneralMethod.PostUserPageFuncDatas(_dto.UserId, _dto.PageId);
+
+                if (pageFunAuthView.CheckAuth == 0) return Ok(JsonView(false, "您没有查看权限!"));
+                #endregion
+
+                #endregion
+
+                Result data = await _hotelPriceRep._Details(_dto.PortType,_dto.Id);
                 if (data.Code != 0)
                 {
                     return Ok(JsonView(false, data.Msg));
@@ -4504,6 +4583,7 @@ namespace OASystem.API.Controllers
             }
         }
 
+
         #endregion
 
         #region 团组状态

OASystem/OASystem.Api/OAMethodLib/GeneralMethod.cs

@@ -1,4 +1,6 @@
-using OASystem.Domain.Entities.PersonnelModule;
+using OASystem.Domain;
+using OASystem.Domain.Entities.Groups;
+using OASystem.Domain.Entities.PersonnelModule;
 using OASystem.Domain.Entities.System;
 using OASystem.Domain.ViewModels.PersonnelModule;
 using OASystem.Infrastructure.Repositories.Groups;
@@ -128,8 +130,7 @@ namespace OASystem.API.OAMethodLib
 
         #endregion
 
-
-        #region 用户页面操作功能
+        #region 用户页面操作功能 权限
         //团组信息
         private readonly static DelegationInfoRepository _dirRep = AutofacIocManager.Instance.GetService<DelegationInfoRepository>();
 
@@ -194,6 +195,42 @@ namespace OASystem.API.OAMethodLib
             return pageFunAuth;
         }
 
+        #endregion
+
+        #region 业务模块 团组权限
+
+        /// <summary>
+        /// 业务模块 团组操作权限
+        /// 验证
+        /// </summary>
+        /// <param name="diId">团组Id</param>
+        /// <param name="userId">用户Id</param>
+        /// <param name="CTable">业务模块Id</param>
+        /// <returns></returns>
+        public static async Task<Result> PostGroupOperationAuth(int diId, int userId, int CTable )
+        {
+            Result _result = new Result { Code = -1,Msg = "No Operation Authorty!" };
+            if (CTable < 1)
+            {
+                _result.Msg = "请填写正确的用户Id!";
+                return _result;
+            }
+
+            var data = await _dirRep._sqlSugar.Queryable<Grp_GroupsTaskAssignment>().Where(it => it.DIId == diId && it.UId == userId && it.CTId == CTable && it.IsDel == 0).FirstAsync();
+
+            if (data == null) 
+            {
+                _result.Msg = "你没有本团下的该业务模块操作,请联系主管分配操作权限!";
+            }
+            else
+            {
+                _result.Code = 0;
+            }
+
+            return _result;
+        }
+
+
         #endregion
     }
 }

OASystem/OASystem.Api/appsettings.json

@@ -134,7 +134,8 @@
   "CTableCorrelationPageDatas": [
     {
       "CTableId": 76, //CtableId 酒店预订
-      "PageIdDatas": [ //页面Id
+      "PageIdDatas": [ //页面Ids
+        28
       ]
 
     },

OASystem/OASystem.Domain/Dtos/Groups/HotelReservationsDto.cs

@@ -14,16 +14,25 @@ namespace OASystem.Domain.Dtos.Groups
     {
         public int DiId { get; set; }
     }
+
     /// <summary>
     /// 酒店预定
     /// BasicsData Dto
     /// </summary>
-    public class HotelReservationBasicsDataInit : PortDtoBase
+    public class HotelReservationBasicsDataInit : UserPageFuncDtoBase
     {
         public int DiId { get; set; }
     }
 
-
+    /// <summary>
+    /// 酒店预定
+    /// Details Dto
+    /// </summary>
+    public class HotelReservationsDetails : UserPageFuncDtoBase
+    {
+       public  int DiId { get; set; }
+        public int Id { get; set; }
+    }
 
 
 

OASystem/OASystem.Domain/Entities/Groups/Grp_HotelReservations.cs

@@ -64,6 +64,7 @@ namespace OASystem.Domain.Entities.Groups
         public string HotelTel { get; set; }
         /// <summary>
         /// 酒店传真
+        /// 弃用 弃用时间 2023-12-28 17:30
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
         public string HotelFax { get; set; }
@@ -84,11 +85,13 @@ namespace OASystem.Domain.Entities.Groups
         public string CheckOutDate { get; set; }
         /// <summary>
         /// 预算金额
+        /// 弃用 弃用时间 2023-12-28 17:30
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "decimal(18,2)")]
         public decimal Budget { get; set; }
         /// <summary>
         /// 预算币种（设置数据外键编号）
+        /// 弃用 弃用时间 2023-12-28 17:30
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "int")]
         public int BudgetCurrency { get; set; }
@@ -134,16 +137,19 @@ namespace OASystem.Domain.Entities.Groups
         public decimal OtherRoomPrice { get; set; }
         /// <summary>
         /// 佣金
+        /// 弃用 弃用时间 2023-12-28 17:30
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "decimal(18,2)")]
         public decimal Commission { get; set; }
         /// <summary>
         /// 佣金币种（设置数据外键编号）
+        /// 弃用 弃用时间 2023-12-28 17:30
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "int")]
         public int CommissionCurrency { get; set; }
         /// <summary>
         /// 佣金标识
+        /// 弃用 弃用时间 2023-12-28 17:30
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "int")]
         public int CommissionMark { get; set; }
@@ -154,6 +160,7 @@ namespace OASystem.Domain.Entities.Groups
         public string RoomExplanation { get; set; }
         /// <summary>
         /// 附件地址
+        /// 弃用 弃用时间 2023-12-28 17:30
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "varchar(500)")]
         public string Attachment { get; set; }
@@ -170,14 +177,21 @@ namespace OASystem.Domain.Entities.Groups
         /// <summary>
         /// 确认标识   信用卡金额
         /// 0：未刷(红色)  1:已刷(绿色)
+        /// 弃用 弃用时间 2023-12-28 17:30
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "int")]
         public int IsCardPrice { get; set; }
         /// <summary>
-        /// 早饭费
+        /// 早餐费
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "decimal(18,2)")]
         public decimal BreakfastPrice { get; set; }
+        /// <summary>
+        /// 早餐费 币种
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public decimal BreakfastCurrency { get; set; }
+
         /// <summary>
         /// 由地接支付
         /// </summary>
@@ -185,41 +199,49 @@ namespace OASystem.Domain.Entities.Groups
         public int Isoppay { get; set; }
         /// <summary>
         /// 是否有单间
+        /// 弃用 弃用时间 2023-12-28 17:30
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "int")]
         public int CboOne { get; set; }
         /// <summary>
         /// 是否有双间
+        /// 弃用 弃用时间 2023-12-28 17:30
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "int")]
         public int CboTwo { get; set; }
         /// <summary>
         /// 是否有酒店套房
+        /// 弃用 弃用时间 2023-12-28 17:30
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "int")]
         public int CboThree { get; set; }
         /// <summary>
         /// 是否有其他房型
+        /// 弃用 弃用时间 2023-12-28 17:30
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "int")]
         public int CboFour { get; set; }
         /// <summary>
         /// 预计单间数量
+        /// 弃用 弃用时间 2023-12-28 17:30
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "int")]
         public int PredictSingleRoom { get; set; }
         /// <summary>
         /// 预计双人间数量
+        /// 弃用 弃用时间 2023-12-28 17:30
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "int")]
         public int PredictDoubleRoom { get; set; }
         /// <summary>
         /// 预计套房数量
+        /// 弃用 弃用时间 2023-12-28 17:30
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "int")]
         public int PredictSuiteRoom { get; set; }
         /// <summary>
         /// 预计其他间数量
+        /// 弃用 弃用时间 2023-12-28 17:30
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "int")]
         public int PredictOtherRoom { get; set; }
@@ -246,7 +268,7 @@ namespace OASystem.Domain.Entities.Groups
         /// <summary>
         /// 房间入住人类型
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
-        public string CheckType { get; set; }
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int CheckType { get; set; }
     }
 }

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

@@ -102,6 +102,226 @@ namespace OASystem.Domain.ViewModels.Groups
 
     }
 
+    /// <summary>
+    /// 酒店预定
+    /// Details  View
+    /// </summary>
+    public class HotelReservationsDetailsView 
+    {
+        public int Id { get; set; }
+
+        /// <summary>
+        /// 客人类型 Id （设置数据外键编号）
+        /// </summary>
+        public int GTId { get; set; }
+
+        /// <summary>
+        /// 信用卡类型 （设置数据外键编号）
+        /// </summary>
+        public int CardPriceCurrency { get; set; }
+
+        /// <summary>
+        /// 入住卷号
+        /// </summary>
+        public string? CheckNumber { get; set; }
+
+        /// <summary>
+        /// 预订网站（设置数据外键编号）
+        /// </summary>
+        public int ReservationsWebsite { get; set; }
+
+        /// <summary>
+        /// 预订号码
+        /// </summary>
+        public string? ReservationsNo { get; set; }
+
+        /// <summary>
+        /// 城市
+        /// </summary>
+        public string? City { get; set; }
+
+        /// <summary>
+        /// 酒店名称
+        /// </summary>
+        public string? HotelName { get; set; }
+
+        /// <summary>
+        /// 酒店名称
+        /// </summary>
+        public string? HotelTel { get; set; }
+
+        /// <summary>
+        /// 酒店地址
+        /// </summary>
+        public string? HotelAddress { get; set; }
+
+        /// <summary>
+        /// 客户名称
+        /// </summary>
+        public string? GuestName { get; set; }
+
+        /// <summary>
+        /// 入住时间
+        /// </summary>
+        public string? CheckInDate { get; set; }
+
+        /// <summary>
+        /// 离店时间
+        /// </summary>
+        public string? CheckOutDate { get; set; }
+
+        /// <summary>
+        /// 房间入住人类型（设置数据外键编号）
+        /// </summary>
+        public int CheckType { get; set; }
+
+        /// <summary>
+        /// 房间说明
+        /// </summary>
+        public string? RoomExplanation { get; set; }
+
+        /// <summary>
+        /// 酒店备注
+        /// </summary>
+        public string? HotelRemark { get; set; }
+
+        /// <summary>
+        /// 单间价格
+        /// </summary>
+        public decimal SingleRoomPrice { get; set; }
+
+        /// <summary>
+        /// 单间数量
+        /// </summary>
+        public int SingleRoomCount { get; set; }
+        
+        /// <summary>
+        /// 双间价格
+        /// </summary>
+        public decimal DoubleRoomPrice { get; set; }
+
+        /// <summary>
+        /// 双间数量
+        /// </summary>
+        public int DoubleRoomCount { get; set; }
+
+        /// <summary>
+        /// 套房价格
+        /// </summary>
+        public decimal SuiteRoomPrice { get; set; }
+
+        /// <summary>
+        /// 套房数量
+        /// </summary>
+        public int SuiteRoomCount { get; set; }
+
+        /// <summary>
+        /// 其他房间价格
+        /// </summary>
+        public decimal OtherRoomPrice { get; set; }
+
+        /// <summary>
+        /// 其他房间数量
+        /// </summary>
+        public int OtherRoomCount { get; set; }
+
+        /// <summary>
+        /// 信用卡金额
+        /// </summary>
+        public decimal CardPrice { get; set; }
+
+        /// <summary>
+        /// 是否由地接支付
+        /// 0 否 1 是
+        /// </summary>
+        public int Isoppay { get; set; }
+
+        /// <summary>
+        /// 早餐价格
+        /// </summary>
+        public decimal BreakfastPrice { get; set; }
+
+        /// <summary>
+        /// 早餐币种 （设置数据外键编号）
+        /// </summary>
+        public int BreakfastCurrency { get; set; }
+
+        /// <summary>
+        /// 地税
+        /// </summary>
+        public decimal GovernmentRent { get; set; }
+
+        /// <summary> 
+        /// 地税币种 （设置数据外键编号）
+        /// </summary>
+        public int GovernmentRentCurrency { get; set; }
+
+        /// <summary>
+        /// 城市税
+        /// </summary>
+        public decimal CityTax { get; set; }
+
+        /// <summary>
+        /// 城市税币种 （设置数据外键编号）
+        /// </summary>
+        public int CityTaxCurrency { get; set; }
+
+        /// <summary>
+        /// 支付方式 （设置数据外键编号）
+        /// </summary>
+        public int PayDId { get; set; }
+
+        /// <summary>
+        /// 消费方式
+        /// </summary>
+        public string? ConsumptionPatterns { get; set; }
+
+        /// <summary>
+        /// 消费日期
+        /// </summary>
+        public string? ConsumptionDate { get; set; }
+
+        /// <summary>
+        /// 付款金额
+        /// </summary>
+        public decimal PayMoney { get; set; }
+
+        /// <summary>
+        /// 付款币种 （设置数据外键编号）
+        /// </summary>
+        public int PaymentCurrency { get; set; }
+
+        /// <summary>
+        /// 对方开户行
+        /// </summary>
+        public string? OtherBankName { get; set; }
+
+        /// <summary>
+        /// 对方银行账号
+        /// </summary>
+        public string? OtherSideNo { get; set; }
+
+        /// <summary>
+        /// 对方姓名
+        /// </summary>
+        public string? OtherSideName { get; set; }
+
+        /// <summary>
+        /// 收款方
+        /// </summary>
+        public string? Payee { get; set; }
+
+        /// <summary>
+        /// 费用标识 （设置数据外键编号）
+        /// </summary>
+        public int OrbitalPrivateTransfer { get; set; }
+
+        /// <summary>
+        /// C表付款信息 备注
+        /// </summary>
+        public string? CcpRemark { get; set; }
+    }
+
     #endregion
 
 

OASystem/OASystem.Infrastructure/Repositories/Groups/HotelPriceRepository.cs

@@ -10,6 +10,7 @@ using OASystem.Domain.ViewModels.Financial;
 using OASystem.Domain.ViewModels.Groups;
 using OASystem.Infrastructure.Tools;
 using SqlSugar;
+using StackExchange.Redis;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -744,93 +745,104 @@ namespace OASystem.Infrastructure.Repositories.Groups
         /// </summary>
         /// <param name="dto"></param>
         /// <returns></returns>
-        public async Task<Result> _BasicsDataInit(HotelReservationBasicsDataInit dto)
+        public async Task<Result> _BasicsDataInit(int portType, int diId)
         {
-            try
-            {
-                if (dto.PortType == 1  || dto.PortType == 2 || dto.PortType == 3)
-                {
-
-                }
-                else
-                {
-                    _result.Msg = "请传入正确的PortType参数,1 Web 2 Android 3 IOS";
-                }
-
-                List<Sys_SetData> _dataSouruce = await _sqlSugar.Queryable<Sys_SetData>().Where(a => a.IsDel == 0).ToListAsync();
-
+            List<Sys_SetData> _dataSouruce = await _sqlSugar.Queryable<Sys_SetData>().Where(a => a.IsDel == 0).ToListAsync();
 
+            if (portType == 1 || portType == 2 || portType == 3)
+            {
                 //客人类型
-                List<Sys_SetData> GuestType = _sqlSugar.Queryable<Sys_SetData>().Where(a => a.IsDel == 0 && a.STid == 11).ToList();
+                List<Sys_SetData> GuestType = _dataSouruce.Where(a => a.STid == 11).ToList();
                 List<SetDataInfoView> _GuestType = _mapper.Map<List<SetDataInfoView>>(GuestType);
 
+                //预订网站
+                List<Sys_SetData> BookingWebsite = _dataSouruce.Where(a => a.STid == 12).ToList();
+                List<SetDataInfoView> _BookingWebsite = _mapper.Map<List<SetDataInfoView>>(BookingWebsite);
+
                 //支付方式
-                List<Sys_SetData> Payment = _sqlSugar.Queryable<Sys_SetData>().Where(a => a.STid == 14 && a.IsDel == 0).ToList();
+                List<Sys_SetData> Payment = _dataSouruce.Where(a => a.STid == 14).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> BankCard = _sqlSugar.Queryable<Sys_SetData>().Where(a => a.STid == 15 && a.IsDel == 0).ToList();
+                List<Sys_SetData> BankCard = _dataSouruce.Where(a => a.STid == 15).ToList();
                 List<SetDataInfoView> _BankCard = _mapper.Map<List<SetDataInfoView>>(BankCard);
 
-                //预订网站
-                List<Sys_SetData> BookingWebsite = _sqlSugar.Queryable<Sys_SetData>().Where(a => a.STid == 12 && a.IsDel == 0).ToList();
-                List<SetDataInfoView> _BookingWebsite = _mapper.Map<List<SetDataInfoView>>(BookingWebsite);
 
-                if (dto.PortType == 2 || dto.PortType == 3)
+                GeneralTeamRateInfoDto postGroupTeamRatedto = new GeneralTeamRateInfoDto()
                 {
-                    GeneralTeamRateInfoDto PostGroupTeamRatedto = new GeneralTeamRateInfoDto();
-                    PostGroupTeamRatedto.DiId = dto.DiId;
-                    PostGroupTeamRatedto.CTable = 76;
-                    PostGroupTeamRatedto.PortType = dto.PortType;
-                    Result teamRateDescAddCurrencyIdViews = PostGroupTeamRateByDiIdAndCTableId(PostGroupTeamRatedto);
-                    List<TeamRateDescAddCurrencyIdView> Currency = new List<TeamRateDescAddCurrencyIdView>();
-                    if (teamRateDescAddCurrencyIdViews.Code == 0)
-                    {
-                        Currency = teamRateDescAddCurrencyIdViews.Data;
-                    }
-                    var data = new
-                    {
-                        GuestType = _GuestType,
-                        Payment = _Payment,
-                        CurrencyList = Currency,
-                        BankCard = _BankCard,
-                        BookingWebsite = _BookingWebsite,
-                    };
-
-                    _result.Code = 0;
-                    _result.Data = data;
-                    _result.Msg = "操作成功!";
-                    return _result ;
+                    DiId = diId,
+                    CTable = 76, //酒店预定
+                    PortType = portType
+                };
+                Result teamRateDescAddCurrencyIdViews = PostGroupTeamRateByDiIdAndCTableId(postGroupTeamRatedto);
+                List<TeamRateDescAddCurrencyIdView> TeamCurrencyRate = new List<TeamRateDescAddCurrencyIdView>();
+                if (teamRateDescAddCurrencyIdViews.Code == 0)
+                {
+                    TeamCurrencyRate = teamRateDescAddCurrencyIdViews.Data;
                 }
-                else
+                var data = new
                 {
-                    var data = new
-                    {
-                        GuestType = _GuestType,
-                        Payment = _Payment,
-                        CurrencyList = _CurrencyList,
-                        BankCard = _BankCard,
-                        BookingWebsite = _BookingWebsite,
-                    };
+                    GuestType = _GuestType,
+                    Payment = _Payment,
+                    CurrencyList = TeamCurrencyRate,
+                    BankCard = _BankCard,
+                    BookingWebsite = _BookingWebsite,
+                };
 
+                _result.Code = 0;
+                _result.Data = data;
+                _result.Msg = "操作成功!";
 
-                    _result.Code = 0;
-                    _result.Data = data;
-                    _result.Msg = "操作成功!";
-                    return _result;
-                }
+            }
+            else
+            {
+                _result.Msg = "请传入正确的PortType参数,1 Web 2 Android 3 IOS!";
+
+            }
+            return _result;
+        }
 
+        /// <summary>
+        /// 酒店预定
+        /// details
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        public async Task<Result> _Details(int portType, int id)
+        {
 
+            if (id < 0 )
+            {
+                _result.Msg = string.Format(@"请输入正确的Id!");
+                return _result;
             }
-            catch (Exception ex)
+
+            string sql = string.Format(@"Select hr.Id,hr.DiId,hr.GTId,hr.CardPriceCurrency,hr.CheckNumber,hr.ReservationsWebsite,hr.ReservationsNo,
+										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.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);
+
+            if (portType == 1 || portType == 2 || portType == 3)
+            {
+                var info = await _sqlSugar.SqlQueryable<HotelReservationsDetailsView>(sql).FirstAsync();
+                if (info != null) _result.Msg = "操作成功!"; 
+                else _result.Msg = "暂无数据"; 
+
+                _result.Code = 0;
+                _result.Data = info;
+                return _result;
+            }
+            else
             {
-                return _result ;
+                _result.Msg = "请传入正确的PortType参数,1 Web 2 Android 3 IOS";
+                return _result;
             }
         }
-
     }
 }