酒店预订

酒店详情修改

OASystem/OASystem.Api/OAMethodLib/PayrollComputation.cs

@@ -1218,8 +1218,6 @@ namespace OASystem.API.OAMethodLib
 
             string am_starttime = "08:59";
             string am_endtime = "13:01";
-            //string startTime = startTime1.ToString("HH:mm:ss");
-            //string endTime = endTime1.ToString("HH:mm:ss");
 
             decimal personalkLeave_dailywage_day = amountPayable / work_days; //日薪 = 事假日薪 *计算方式：日平均工资 = 当月应发工资 /当月应出勤天数。
 
@@ -1291,11 +1289,11 @@ namespace OASystem.API.OAMethodLib
                                     decimal sjLongTime = sj_slice_Info.duration / 3600.00M;
                                     if (sjLongTime == 3.00M)
                                     {
-                                        typeDeduction += personalkLeave_dailywage_day / 7.50M * 3.50M;
+                                        typeDeduction = typeDeduction+  personalkLeave_dailywage_day / 7.50M * 3.50M;
                                     }
                                     else if (sjLongTime == 4.50M)
                                     {
-                                        typeDeduction += personalkLeave_dailywage_day / 7.50M * 4.50M;
+                                        typeDeduction = typeDeduction+ personalkLeave_dailywage_day / 7.50M * 4.50M;
                                     }
                                 }
                             }
@@ -1348,7 +1346,6 @@ namespace OASystem.API.OAMethodLib
                     break;
                 case 3: //3病假
                         // 病假日薪 *计算方式：日平均工资 = 成都市最低工资标准的80% /当月应出勤天数。 短期病假=当月15天内 
-
                     decimal chengDuMinimumWage_Day = _chengDuMinimumWage / work_days;
                     decimal chengDuMinimumWage_halrHour = chengDuMinimumWage_Day / 7.50M;
                     decimal sickLeave_dailywage_halfhour_deduction1 = (personalkLeave_dailywage_day / 7.50M) - chengDuMinimumWage_halrHour; //病假单位 0.5小时 扣款金额
@@ -1366,8 +1363,8 @@ namespace OASystem.API.OAMethodLib
                         {
                             decimal bj_wholeDay = Math.Floor(duration); //整天
                             decimal bj_halfDay = duration % 1; //半天
-                            typeDeduction = pl_dailywage_day * bj_wholeDay;
-
+                            decimal bj_wholeDayWage = pl_dailywage_day * bj_wholeDay;
+                            decimal bj_halfDayWage = 0.00M;
                             if (bj_halfDay > 0)
                             {
                                 LeaveDetails bjDetails = leaveDetails.Where(it => it.StartDt == startTime && it.EndDt == endTime).FirstOrDefault();
@@ -1379,19 +1376,17 @@ namespace OASystem.API.OAMethodLib
                                     decimal bjLongTime = bj_slice_Info.duration / 3600.00M;
                                     if (bjLongTime == 3.00M)
                                     {
-                                        typeDeduction += pl_dailywage_day / 7.50M * 3.50M;
+                                        bj_halfDayWage =   (pl_dailywage_day / 7.50M) * 3.50M;
                                     }
                                     else if (bjLongTime == 4.50M)
                                     {
-                                        typeDeduction += pl_dailywage_day / 7.50M * 4.50M;
+                                        bj_halfDayWage = (pl_dailywage_day / 7.50M) * 4.50M;
                                     }
                                 }
                             }
 
-                            typeDeduction = ConvertToDecimal(typeDeduction);
+                            typeDeduction = ConvertToDecimal(bj_wholeDayWage + bj_halfDayWage);
                         }
-
-                        typeDeduction = ConvertToDecimal( sickLeave_dailywage_halfhour_deduction1 * halfHour);
                     }
                     else if (date_Range_type == "hour")
                     {

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

@@ -134,6 +134,11 @@ namespace OASystem.Domain.ViewModels.Groups
         /// 预订号码
         /// </summary>
         public string? ReservationsNo { get; set; }
+        
+        /// <summary>
+        /// 确认号码
+        /// </summary>
+        public string? DetermineNo { get; set; }
 
         /// <summary>
         /// 城市
@@ -146,7 +151,7 @@ namespace OASystem.Domain.ViewModels.Groups
         public string? HotelName { get; set; }
 
         /// <summary>
-        /// 酒店名称
+        /// 酒店电话
         /// </summary>
         public string? HotelTel { get; set; }
 

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

@@ -859,7 +859,7 @@ 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,
+            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,