1.酒店预订-->预定成本excel下载 字段调整

2.ocr识别 修改

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -71,6 +71,8 @@ using NPOI.POIFS.NIO;
 using OASystem.API.OAMethodLib.QiYeWeChatAPI.AppNotice;
 using OASystem.Domain.ViewModels.Statistics;
 using NPOI.XSSF.Model;
+using NetTaste;
+using Microsoft.AspNetCore.Http;
 
 namespace OASystem.API.Controllers
 {
@@ -10351,12 +10353,43 @@ namespace OASystem.API.Controllers
             //#endregion
 
             #endregion
+            decimal _rate = 1.00M;
+            string _currency = "";
 
+            var currDatas = _sqlSugar.Queryable<Sys_SetData>().Where(it => it.STid == 66).ToList();
             List<Grp_HotelReservations> hrDtas = await _sqlSugar.Queryable<Grp_HotelReservations>().Where(it => it.IsDel == 0 && it.DiId == _dto.DiId).ToListAsync();
+            if (hrDtas.Count < 1) return Ok(JsonView(false, "酒店预订费用未录入,不支持预定成本Excel导出"));
 
-            //判断数据是否完整
-            if (hrDtas.Count < 1) return Ok(JsonView(false, "请先录入酒店预订信息！"));
+            Grp_GroupCostParameter _GroupCostParameter = await _sqlSugar.Queryable<Grp_GroupCostParameter>().Where(it => it.IsDel == 0 && it.DiId == _dto.DiId).FirstAsync();
+            if (_GroupCostParameter == null) return Ok(JsonView(false, "团组成本费用未录入,不支持预定成本Excel导出"));
+            if (string.IsNullOrEmpty(_GroupCostParameter.Currency))
+            {
+                return Ok(JsonView(false, "团组成本费用“币种为录入”未录入,不支持预定成本Excel导出"));
+            }
+            _currency = _GroupCostParameter.Currency;
+
+            bool isIntType = int.TryParse(_currency, out int currId);
+            if (isIntType)
+            {
+                _currency = currDatas.Find(it => it.Id == currId)?.Name ?? "";
+                
+            }
+
+            var teamRate = await _teamRateRep.PostGroupTeamRateItemByDiIdAndCTableId(1, _dto.DiId, 76);
 
+            var currInfo = teamRate.Find(it => it.CurrencyCode.Equals(_currency));
+            if (currInfo == null)
+            {
+                return Ok(JsonView(false, $"团组汇率-->酒店模块 {_currency} 币种未设置汇率,不支持预定成本Excel导出"));
+                
+            }
+
+            if (!_currency.ToUpper().Equals("CNY"))
+            {
+                _rate = _GroupCostParameter.Rate;
+            }
+
+            _rate = currInfo.Rate;
             hrDtas = hrDtas.OrderBy(it => it.CheckInDate).ToList();
             string strFileName = "HotelStatement/";
 
@@ -10365,38 +10398,85 @@ 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 ?? "";
+
+                string singleRoomFeeStr = string.Empty,
+                       doubleRoomFeeStr = string.Empty,
+                       suiteRoomFeeStr = string.Empty,
+                       otherRoomFeeStr = string.Empty,
+                       payMoneyStr = string.Empty,
+                       cardPriceStr = string.Empty;
+                if (roomCurr.Equals(_currency))
+                {
+                    singleRoomFeeStr = $"{item.SingleRoomPrice.ToString("#0.00")} {_currency}";
+                    doubleRoomFeeStr = $"{item.DoubleRoomPrice.ToString("#0.00")} {_currency}";
+                    suiteRoomFeeStr = $"{item.SuiteRoomPrice.ToString("#0.00")} {_currency}";
+                    otherRoomFeeStr = $"{item.OtherRoomPrice.ToString("#0.00")} {_currency}";
+                    payMoneyStr = $"{ccpInfo.PayMoney.ToString("#0.00")} {_currency}";
+                    cardPriceStr = $"{item.CardPrice.ToString("#0.00")} {_currency}";
+                }
+                else
+                {
+                    singleRoomFeeStr = $"{(item.SingleRoomPrice / _rate).ToString("#0.00")} {_currency}\r\n{item.SingleRoomPrice.ToString("#0.00")} {roomCurr}";
+                    doubleRoomFeeStr = $"{(item.DoubleRoomPrice / _rate).ToString("#0.00")} {_currency}\r\n{item.DoubleRoomPrice.ToString("#0.00")} {roomCurr}";
+                    suiteRoomFeeStr = $"{(item.SuiteRoomPrice / _rate).ToString("#0.00")} {_currency}\r\n{item.SuiteRoomPrice.ToString("#0.00")} {roomCurr}";
+                    otherRoomFeeStr = $"{(item.OtherRoomPrice / _rate).ToString("#0.00")} {_currency}\r\n{item.OtherRoomPrice.ToString("#0.00")} {roomCurr}";
+                    payMoneyStr = $"{(ccpInfo.PayMoney / _rate).ToString("#0.00")} {_currency}\r\n{ccpInfo.PayMoney.ToString("#0.00")} {roomCurr}";
+                    cardPriceStr = $"{(item.CardPrice / _rate).ToString("#0.00")} {_currency}\r\n{item.CardPrice.ToString("#0.00")} {roomCurr}";
+                }
+                string breakfastPriceStr = string.Empty,
+                       breakfastCurrency = currDatas.Find(it => it.Id == item.BreakfastCurrency)?.Name ?? "",
+                       governmentRentStr = string.Empty,
+                       governmentRentCurrency = currDatas.Find(it => it.Id == item.GovernmentRentCurrency)?.Name ?? "",
+                       cityTaxStrStr = string.Empty,
+                       cityTaxStrCurrency = currDatas.Find(it => it.Id == item.CityTaxCurrency)?.Name ?? "";
+
+                //if (breakfastCurrency.Equals(_currency))
+                //{
+                //    breakfastPriceStr = $"{item.BreakfastPrice.ToString("#0.00")} ({_currency})";
+                //}
+                //if (governmentRentCurrency.Equals(_currency))
+                //{
+                //    governmentRentStr = $"{item.GovernmentRent.ToString("#0.00")} ({_currency})";
+                //}
+                //if (cityTaxStrCurrency.Equals(_currency))
+                //{
+                //    cityTaxStrStr = $"{item.CityTax.ToString("#0.00")} ({_currency})";
+                //}
+
+                breakfastPriceStr = $"{item.BreakfastPrice.ToString("#0.00")} {_currency}";
+                governmentRentStr = $"{item.GovernmentRent.ToString("#0.00")} {_currency}";
+                cityTaxStrStr = $"{item.CityTax.ToString("#0.00")} {_currency}";
+
                 pcfds.Add(new HotelReservations_PCFD_View()
                 {
                     City = item.City,
                     HotelName = item.HotelName,
                     Date = $"{item.CheckInDate} - {item.CheckOutDate}",
-                    SingleRoomCount = item.SingleRoomCount,
-                    SingleRoomPrice = item.SingleRoomPrice.ToString("#0.00") + " " + roomCurr,
-                    DoubleRoomCount = item.DoubleRoomCount,
-                    DoubleRoomPrice = item.DoubleRoomPrice.ToString("#0.00") + " " + roomCurr,
-                    SuiteRoomCount = item.SuiteRoomCount,
-                    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 ?? ""}",
+                   // SingleRoomCount = item.SingleRoomCount,
+                    SingleRoomPrice = singleRoomFeeStr,
+                   // DoubleRoomCount = item.DoubleRoomCount,
+                    DoubleRoomPrice = doubleRoomFeeStr,
+                    //SuiteRoomCount = item.SuiteRoomCount,
+                    SuiteRoomPrice = suiteRoomFeeStr,
+                    OtherRoomPrice = otherRoomFeeStr,
+                    //OtherRoomCount = item.OtherRoomCount,
+
+                    BreakfastPrice = breakfastPriceStr,
+                    GovernmentRent = governmentRentStr,
+                    CityTax = cityTaxStrStr,
 
                     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.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 + " " + _sqlSugar.Queryable<Sys_SetData>().Where(it => it.Id == ccpInfo.PaymentCurrency).First()?.Name ?? "",
+                    PayMoney = payMoneyStr,
+                    //PayMoneys = ccpInfo.PayMoney.ToString("#0.00"),
+                    ConsumptionPatterns = ccpInfo.ConsumptionPatterns,
+                    CardPrice = cardPriceStr,
                     Remark = ccpInfo.Remark
 
                 }); 
@@ -10411,7 +10491,7 @@ namespace OASystem.API.Controllers
             var groupInfo = _sqlSugar.Queryable<Grp_DelegationInfo>().Where(it => it.Id == _dto.DiId).First();
             var userInfo = _sqlSugar.Queryable<Sys_Users>().Where(it => it.Id == hrDtas[0].CreateUserId).First();
             designer.SetDataSource("TourNo", groupInfo.TourCode);
-            designer.SetDataSource("TeamName", groupInfo.TeamName);
+            designer.SetDataSource("TeamName", $"{groupInfo.TeamName}  团组成本币种：{_currency}  团组汇率-->酒店模块汇率：{_rate.ToString("#0.0000")}");
             designer.SetDataSource("Opertor", userInfo.CnName);
 
             DataTable dt = CommonFun.GetDataTableFromIList<HotelReservations_PCFD_View>(pcfds);
@@ -10419,10 +10499,124 @@ namespace OASystem.API.Controllers
             designer.SetDataSource(dt);
             designer.Process();
             string fileName = ($"HotelReservation/{groupInfo.TeamName}_酒店预订成本_" + DateTime.Now.ToString("yyyyMMddHHmmss") + ".xls").Replace(":", "");
-            designer.Workbook.Save(AppSettingsHelper.Get("ExcelBasePath") + fileName);
+            string serverPath = AppSettingsHelper.Get("ExcelBasePath") + fileName;
+            designer.Workbook.Save(serverPath);
             string rst = AppSettingsHelper.Get("ExcelBaseUrl") + AppSettingsHelper.Get("ExcelFtpPath") + fileName;
+
+            #region 删除指定行
+
+            bool singleDel = true, doubleDel = true, suiteDel = true, otherDel = true, zcDel = true, dsDel = true, cssDel = true, remarkDel = true;
+            int singleIndex = dt.Columns["SingleRoomPrice"].Ordinal,
+                doubleIndex = dt.Columns["DoubleRoomPrice"].Ordinal,
+                suiteIndex = dt.Columns["SuiteRoomPrice"].Ordinal,
+                otherIndex = dt.Columns["OtherRoomPrice"].Ordinal,
+                zcIndex = dt.Columns["BreakfastPrice"].Ordinal,
+                dsIndex = dt.Columns["GovernmentRent"].Ordinal,
+                cssIndex = dt.Columns["CityTax"].Ordinal,
+                remarkIndex = dt.Columns["Remark"].Ordinal;
+            //删除指定列
+            foreach (DataRow item in dt.Rows)
+            {
+                string singleStr = item["SingleRoomPrice"].ToString(); 
+                bool containsDigitButNotZero1 = !singleStr.StartsWith("0") && Regex.IsMatch(singleStr, @"[1-9]");
+                if (containsDigitButNotZero1) singleDel = false;
+                singleIndex = dt.Columns["SingleRoomPrice"].Ordinal;
+
+                string doubleStr = item["DoubleRoomPrice"].ToString();
+                bool containsDigitButNotZero2 = !doubleStr.StartsWith("0") && Regex.IsMatch(doubleStr, @"[1-9]");
+                if (containsDigitButNotZero2) doubleDel = false;
+
+
+                string suiteStr = item["SuiteRoomPrice"].ToString();
+                bool containsDigitButNotZero3 = !singleStr.StartsWith("0") && Regex.IsMatch(doubleStr, @"[1-9]");
+                if (containsDigitButNotZero3) suiteDel = false;
+
+
+                string otherStr = item["OtherRoomPrice"].ToString();
+                bool containsDigitButNotZero4 = !otherStr.StartsWith("0") && Regex.IsMatch(otherStr, @"[1-9]");
+                if (containsDigitButNotZero4) otherDel = false;
+
+
+                string zcStr = item["BreakfastPrice"].ToString();
+                bool containsDigitButNotZero5 = !zcStr.StartsWith("0") && Regex.IsMatch(zcStr, @"[1-9]");
+                if (containsDigitButNotZero5) zcDel = false;
+
+
+                string dsStr = item["GovernmentRent"].ToString();
+                bool containsDigitButNotZero6 = !dsStr.StartsWith("0") && Regex.IsMatch(dsStr, @"[1-9]");
+                if (containsDigitButNotZero6) dsDel = false;
+
+
+                string cssStr = item["CityTax"].ToString();
+                bool containsDigitButNotZero7 = !cssStr.StartsWith("0") && Regex.IsMatch(cssStr, @"[1-9]");
+                if (!containsDigitButNotZero7) cssDel = false;
+
+                string remarkStr = item["Remark"].ToString();
+                if (!string.IsNullOrEmpty(remarkStr)) remarkDel = false;
+
+            }
+            //singleDel = true,doubleDel = true, suiteDel = true,otherDel = true,zcDel = true,dsDel = true,cssDel = true;
+            int delColumn = 0;
+            if (singleDel) { DeleteColumn(serverPath, singleIndex - delColumn); delColumn++; }
+            if (doubleDel) { DeleteColumn(serverPath, doubleIndex - delColumn); delColumn++; }
+            if (suiteDel) { DeleteColumn(serverPath, suiteIndex - delColumn); delColumn++; }
+            if (otherDel) { DeleteColumn(serverPath, otherIndex - delColumn); delColumn++; }
+            if (zcDel) { DeleteColumn(serverPath, zcIndex - delColumn); delColumn++; }
+            if (dsDel) { DeleteColumn(serverPath, dsIndex - delColumn); delColumn++; }
+            if (cssDel) { DeleteColumn(serverPath, cssIndex - delColumn); delColumn++; }
+            if (remarkDel) { DeleteColumn(serverPath, remarkIndex - delColumn); delColumn++; }
+            #endregion
+            //只保留第一个表格
+            DeleteSheet(serverPath);
+
             return Ok(JsonView(true, "操作成功", url = rst));
-            
+        }
+
+        /// <summary>
+        /// 删除指定列
+        /// </summary>
+        /// <param name="file"></param>
+        /// <param name="columnIndex"></param>
+        /// <param name="totalColumns"></param>
+        /// <param name="sheetName"></param>
+        private void DeleteColumn(string file, int columnIndex)
+        {
+
+            Aspose.Cells.Workbook wb = new Aspose.Cells.Workbook(file);
+            //wb.Save(file);
+            Aspose.Cells.Worksheet sheet1 = wb.Worksheets[0];
+           
+            if (sheet1 != null)
+            {
+                Cells cells = sheet1.Cells;
+                cells.DeleteColumn(columnIndex);
+            }
+            wb.Save(file);
+        }
+
+        /// <summary>
+        /// 删除sheet
+        /// </summary>
+        /// <param name="file"></param>
+        /// <param name="sheetName"></param>
+        private void DeleteSheet(string file, string sheetName="")
+        {
+            Aspose.Cells.Workbook wb = new Aspose.Cells.Workbook(file);
+            //wb.Save(file);
+            List<string> sheets = new List<string>();
+            foreach (var item in wb.Worksheets)
+            {
+                sheets.Add(item.Name);
+            }
+            if (sheets.Count > 0)
+            {
+                sheets.RemoveAt(0);//不删除第一个sheet
+                foreach (var item in sheets)
+                {
+                    wb.Worksheets.RemoveAt(item);
+                }
+            }
+            wb.Save(file);
         }
 
         /// <summary>

OASystem/OASystem.Api/Controllers/TencentOCRController.cs

@@ -128,7 +128,7 @@ namespace OASystem.API.Controllers
 
             IDCardOCRAndDownUrlView iDCardOCRView = new IDCardOCRAndDownUrlView() { };
 
-            if (dto.Language.ToLower() == "ch")
+            if (dto.Language == 1)
             {
                 bool cerdStatus = await _visaDeleClientRepository.SetCrmUpdPassIdCardOCR(
                new SetCrmUpdPassIdCardOCRDto
@@ -149,7 +149,7 @@ namespace OASystem.API.Controllers
                 iDCardOCRView.Authority = idCardData.Data.Authority;
                 iDCardOCRView.ValidDate = idCardData.Data.ValidDate;
             }
-            else if (dto.Language.ToLower() == "en")
+            else if (dto.Language == 2)
             {
                 iDCardOCRView.Name = !string.IsNullOrEmpty( idCardData.Data.Name) ? await YouDaoApiTools.GetOCR_ReTrans(idCardData.Data.Name) : "";
                 iDCardOCRView.Sex = !string.IsNullOrEmpty(idCardData.Data.Sex) ? await YouDaoApiTools.GetOCR_ReTrans(idCardData.Data.Sex) : "";
@@ -173,12 +173,12 @@ namespace OASystem.API.Controllers
             dic.Add("ValidDate", iDCardOCRView.ValidDate);
 
             string serverPath = "";
-            if (dto.Language.ToLower() == "ch")
+            if (dto.Language == 1)
             {
                 string fileNameCh = string.Format("{0}.doc", dic["Name"].ToString() + "身份证(人像面)[CH]" + DateTime.Now.ToString("yyyyMMddHHmmss"));
                 serverPath = AsposeHelper.ExpertWordToModel("ocr_身份证(人像面).doc", "TencentOCR", fileNameCh, dic, null);
             }
-            else if (dto.Language.ToLower() == "en")
+            else if (dto.Language == 2)
             {
                 string fileNameEn = string.Format("{0}.doc", dic["Name"].ToString() + "身份证(人像面)[EN]" + DateTime.Now.ToString("yyyyMMddHHmmss"));
                 serverPath = AsposeHelper.ExpertWordToModel("(EN)ocr_身份证(人像面).doc", "TencentOCR", fileNameEn, dic, null);

OASystem/OASystem.Api/OAMethodLib/TencentCloudAPI/TencentOCRTools.cs

@@ -120,7 +120,7 @@ namespace OASystem.API.OAMethodLib.TencentCloudAPI
                         MLIDPassportOCRResponse mlidpRep = client.MLIDPassportOCRSync(mlidpReq);
                         result.Data = mlidpRep;
                         break;
-                    case 9: // 护照识别（港澳台地区及境外护照）
+                    case 9: // 名片识别
                         BusinessCardOCRDto bcOCR = (BusinessCardOCRDto)data;
                         BusinessCardOCRRequest bcReq = new BusinessCardOCRRequest();
                         bcReq.ImageBase64 = bcOCR.picBase64;

OASystem/OASystem.Domain/Dtos/Tencent/IDCardOCRDto.cs

@@ -16,10 +16,10 @@ namespace OASystem.Domain.Dtos.Tencent
 
         /// <summary>
         /// 语言
-        /// ch 中文
-        /// en 英文
+        /// 1 ch 中文
+        /// 2 en 英文
         /// </summary>
-        public string Language { get; set; }
+        public int Language { get; set; }
 
         /// <summary>
         /// 图片的 Base64 值。要求图片经Base64编码后不超过 7M，分辨率建议500*800以上，支持PNG、JPG、JPEG、BMP格式。建议卡片部分占据图片2/3以上。
@@ -41,7 +41,6 @@ namespace OASystem.Domain.Dtos.Tencent
     public class IDCardOCRDtoFoalidator : AbstractValidator<IDCardOCRDto>
     {
 
-        private readonly List<string> _languages = new List<string>() { "ch", "en" };
         public IDCardOCRDtoFoalidator()
         {
             RuleFor(it => it.UserId)
@@ -51,9 +50,8 @@ namespace OASystem.Domain.Dtos.Tencent
             RuleFor(it => it.Language)
                 .NotNull()
                 .NotEmpty()
-                .WithMessage($"Language：参数值为空")
-                .Must(LanguageBeAllowedValue)
-                .WithMessage($"Language：无效值");
+                .InclusiveBetween(1, 2)
+                .WithMessage("Language(超出范围)：1 ch 中文 2 en 英文");
 
             RuleFor(it => it.picBase64).NotNull().NotEmpty().WithMessage("picBase64为空");
             RuleFor(it => it.picBase64).Must(base64 => OCRVerifyMethod.ImageSize(base64)).WithMessage("图片不能大于7M!");
@@ -61,10 +59,6 @@ namespace OASystem.Domain.Dtos.Tencent
             RuleFor(it => it.CardSide).InclusiveBetween(0, 1).WithMessage("CardSide(超出范围)：0 人像面 1 国徽面");
         }
 
-        private bool LanguageBeAllowedValue(string value)
-        {
-            return _languages.Contains(value.ToLower());
-        }
     }
 
 }

OASystem/OASystem.Domain/Dtos/Tencent/OCRDtoBase.cs

@@ -37,12 +37,13 @@ namespace OASystem.Domain.Dtos.Tencent
                 .NotEmpty()
                 .NotNull()
                 .WithMessage("picBase64为空");
+
             RuleFor(it => it.picBase64)
                 .Must(base64 => OCRVerifyMethod.ImageSize(base64))
                 .WithMessage("图片不能大于7M!");
-            RuleFor(it => it.picBase64)
-                .Must(base64 => OCRVerifyMethod.ImageType(base64))
-                .WithMessage("图片格式不正确!只支持 PNG、JPG、JPEG、BMP格式的文件!");
+            //RuleFor(it => it.picBase64)
+            //    .Must(base64 => OCRVerifyMethod.ImageType(base64))
+            //    .WithMessage("图片格式不正确!只支持 PNG、JPG、JPEG、BMP格式的文件!");
             RuleFor(it => it.language)
                 .InclusiveBetween(1, 2)
                 .WithMessage("language(超出范围)：1 中文 2 英文");

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

@@ -394,56 +394,40 @@ namespace OASystem.Domain.ViewModels.Groups
         /// </summary>
         public string Date { get; set; }
 
-        /// <summary>
-        /// 单间数量
-        /// </summary>
-        public int SingleRoomCount { get; set; }
         /// <summary>
         /// 单间单价
         /// </summary>
         public string SingleRoomPrice { get; set; }
         /// <summary>
-        /// 双间数量
-        /// </summary>
-        public int DoubleRoomCount { get; set; }
-        /// <summary>
         /// 双间单价
         /// </summary>
         public string DoubleRoomPrice { get; set; }
         /// <summary>
-        /// 套房数量
-        /// </summary>
-        public int SuiteRoomCount { get; set; }
-        /// <summary>
         /// 套房单价
         /// </summary>
         public string SuiteRoomPrice { get; set; }
         /// <summary>
-        /// 其他房型数量
-        /// </summary>
-        public int OtherRoomCount { get; set; }
-        /// <summary>
         /// 其他房型单价
         /// </summary>
         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>
+        public string GovernmentRent { get; set; }
+
         /// <summary>
         /// 消费说明
         /// </summary>
@@ -452,7 +436,7 @@ namespace OASystem.Domain.ViewModels.Groups
         /// <summary>
         /// 消费方式
         /// </summary>
-        public string Consumptionpatterns { get; set; }
+        public string ConsumptionPatterns { get; set; }
 
         /// <summary>
         /// 支付方式
@@ -471,10 +455,6 @@ namespace OASystem.Domain.ViewModels.Groups
         /// </summary>
         public string PayMoney { get; set; }
 
-        /// <summary>
-        /// 付款付款金额币种
-        /// </summary>
-        public string PayMoneyCurrency { get; set; }
 
         /// <summary>
         /// 行用卡金额

OASystem/OASystem.Infrastructure/Repositories/Groups/TeamRateRepository.cs

@@ -502,7 +502,6 @@ namespace OASystem.Infrastructure.Repositories.Groups
             return _view;
         }
 
-
         /// <summary>
         /// 团组汇率币种拆分
         /// 团组币种按指定格式拆分 返回集合
@@ -562,7 +561,6 @@ namespace OASystem.Infrastructure.Repositories.Groups
             return _view;
         }
 
-
         /// <summary>
         /// 团组汇率 币种 Item (来源：团组汇率)
         /// 根据 团组Id And 业务类型(CTable)Id