Merge branch 'develop' of http://132.232.92.186:3000/XinXiBu/OA2023 into develop

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

@@ -8,6 +8,11 @@ namespace OASystem.Domain.Dtos.Groups
 {
     public class HotelReservationsDto
     {
+        /// <summary>
+        /// 请求端口分类
+        /// 1 Web 2 Android 3 IOS
+        /// </summary>
+        public int PortType { get; set; } = 1;
         public int UserId { get; set; }
     }
     /// <summary>

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

@@ -356,17 +356,34 @@ namespace OASystem.Infrastructure.Repositories.Groups
                 //预订网站
                 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);
-
-                var data = new
+               
+                if (dto.PortType==2 || dto.PortType==3)
                 {
-                    Delegations = grp_Delegations,
-                    GuestType = _GuestType,
-                    Payment = _Payment,
-                    CurrencyList = _CurrencyList,
-                    BankCard = _BankCard,
-                    BookingWebsite = _BookingWebsite,
-                };
-                return result = new Result() { Code = 0, Msg = "查询成功",Data=data };
+                    var data = new
+                    {
+                        GuestType = _GuestType,
+                        Payment = _Payment,
+                        CurrencyList = _CurrencyList,
+                        BankCard = _BankCard,
+                        BookingWebsite = _BookingWebsite,
+                    };
+                    return result = new Result() { Code = 0, Msg = "查询成功", Data = data };
+                }
+                else
+                {
+                    var data = new
+                    {
+                        Delegations = grp_Delegations,
+                        GuestType = _GuestType,
+                        Payment = _Payment,
+                        CurrencyList = _CurrencyList,
+                        BankCard = _BankCard,
+                        BookingWebsite = _BookingWebsite,
+                    };
+                    return result = new Result() { Code = 0, Msg = "查询成功", Data = data };
+                }
+                
+                
             }
             catch (Exception ex)
             {