酒店预订

基础数据 Item Info 等接口
微调

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -4472,18 +4472,13 @@ namespace OASystem.API.Controllers
 
                 #endregion
 
-                Result data = await _hotelPriceRep._ItemsByDiId(_dto.PortType, _dto.DiId);
-                if (data.Code != 0)
+                Result _view = await _hotelPriceRep._ItemsByDiId(_dto.PortType, _dto.DiId);
+                if (_view.Code != 0)
                 {
-                    return Ok(JsonView(false, data.Msg));
+                    return Ok(JsonView(false, _view.Msg));
                 }
-                var _view = new
-                {
-                    PageFuncAuth = pageFunAuthView,
-                    Data = data
-                };
-
-                return Ok(JsonView(true, data.Msg, _view));
+                
+                return Ok(JsonView(true, _view.Msg, _view));
             }
             catch (Exception ex)
             {
@@ -4583,6 +4578,55 @@ namespace OASystem.API.Controllers
             }
         }
 
+        /// <summary>
+        /// 酒店预订
+        /// Add Or Edit 
+        /// </summary>
+        /// <param name="_dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        public async Task<IActionResult> PostHotelReservationsAddOrEdit(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 (_dto.Id == 0) // Add
+                    if (pageFunAuthView.AddAuth == 0) return Ok(JsonView(false, "您没有添加权限!"));
+                else if (_dto.Id > 0) // Edit
+                    if (pageFunAuthView.EditAuth == 0) return Ok(JsonView(false, "您没有编辑权限!"));
+                        else return Ok(JsonView(false, "请输入正确的数据Id!"));
+
+                #endregion
+
+                #endregion
+
+                Result data = await _hotelPriceRep._Details(_dto.PortType, _dto.Id);
+                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));
+            }
+        }
 
         #endregion
 

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

@@ -34,6 +34,24 @@ namespace OASystem.Domain.Dtos.Groups
         public int Id { get; set; }
     }
 
+    /// <summary>
+    /// 酒店预定
+    /// Add Or Edit
+    /// </summary>
+    public class HotelReservationsAddOrEdit : UserPageFuncDtoBase
+    {
+        /// <summary>
+        /// Id
+        /// Id == 0 Add  Or Id > 0 Edit
+        /// </summary>
+        public int Id { get; set; }
+        
+        /// <summary>
+        /// 团组Id
+        /// </summary>
+        public int DiId { get; set; }
+    }
+
 
 
 

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

@@ -818,15 +818,16 @@ namespace OASystem.Infrastructure.Repositories.Groups
             }
 
             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);
+										 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);
 
             if (portType == 1 || portType == 2 || portType == 3)
             {